diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e6553ada2f..092f0925c7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230313 +Version: 7.0NG.769-230316 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index cadc4a6fd2..d71a7b978b 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.769-230313" +pandora_version="7.0NG.769-230316" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index f828e1a7ae..539b2e24a6 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230313'; +use constant AGENT_BUILD => '230316'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 4ff8cf8848..468ec39656 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230313 +%define release 230316 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 6705e0ee72..628a9064a0 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230313 +%define release 230316 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 06c37d34cd..623e85f1cf 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230313" +PI_BUILD="230316" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/unix/plugins/autodiscover b/pandora_agents/unix/plugins/autodiscover index 03b2c3d76d..01b9bd3d96 100644 --- a/pandora_agents/unix/plugins/autodiscover +++ b/pandora_agents/unix/plugins/autodiscover @@ -6,21 +6,22 @@ # # (c) A. Kevin Rojas # +# Edited in 2023 by Alejandro Sánchez +# # TO DO LIST: # - Enable child services detection (Windows) # - Make CPU/Memory usage available for child services (Windows) # ################################################### - try: from sys import argv from sys import stderr from sys import exit + import psutil from subprocess import Popen from subprocess import PIPE from subprocess import DEVNULL from subprocess import getstatusoutput - import psutil except ModuleNotFoundError as err: print("{} error: {}. Exiting...".format(argv[0], err), file=stderr) exit(1) @@ -28,99 +29,100 @@ except ModuleNotFoundError as err: module_list = [] VERSION = "1.2" +def win_service(servicelist, option=False, memcpu=False): -######################################################################################### -# Powershell class -######################################################################################### -class PSCheck: - @staticmethod - def check_service(servicename, option=False, memcpu=False): - """Check services with powershell by parsing their DisplayName. Returns a dict\ - list with the name of the service and a boolean with its status.\n - Requires service name (case insensitive).""" - pscall = Popen(["powershell", "Get-Service", "-Name", "'*"+ str(servicename) + "*'", - "|", "Select-Object", "-ExpandProperty", "Name"], - stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True) - result = pscall.communicate() - result = str(result[0]).strip().split("\n") - procname = '' - if result != '': - output = [] - for element in result: - if element != '': - # Get process name - procname = PSCheck.get_serviceprocess(element) - # Get process status - parstatus = PSCheck.getstatus(element) - if memcpu and parstatus == 1: - usage = get_memcpu(str(procname), str(element)) - output += usage - # Generate module with name and status - parent = service_module(str(element), parstatus) - output += parent - if option: - children = PSCheck.getchildren(element, memcpu) - if isinstance(children, list) and len(children) > 1: - for child in children: - output += child - else: - output += children - else: - next - - if output and element and procname: - return ({"name" : element, "process" : procname, "modules": output}) + modules_default = [] + modules_percentage=[] + ## take all services + services=psutil.win_service_iter() + for service in services: + if service.name() in servicelist: + serv=service.as_dict() + if serv['status']=='running': + value=1 else: - return (None) + value=0 - @staticmethod - def getchildren(servicename, memcpu=False): - """Gets Dependent services of a given Windows service""" - pschild = Popen(["powershell", "Get-Service", "-Name '" + str(servicename) + - "' -DS", "|", "Select-Object", "-ExpandProperty", "Name"], - stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True) - children = pschild.communicate()[0].strip() - kids = [] - for child in (children.split("\n") if children != "" else []): - status = PSCheck.getstatus(child) - kids += service_module(str(child), status, "Service " + str(servicename) + " - Status") - if status: - if memcpu: - kidsusage = get_memcpu(str(child)) - for usage in kidsusage: - kids += usage + ## create module for each service + parent = build_module("Service " + str(serv['name']) + " - Status", value,"generic_proc") + modules_default +=parent + + # memory and cpu percentage + if memcpu: + ## process + srv_pid = service.pid() + process = psutil.Process(srv_pid) + proc_name = process.name() + ##cpu + value_cpu=process.cpu_percent(interval=0.5) + parent = build_module("Service " + str(proc_name) + " - CPU usage", value_cpu,"generic_data") + parent[0].update([("unit","%"),("module_parent",str(serv['name']))]) + modules_percentage +=parent + ##mem + value_mem=process.memory_percent() + parent = build_module("Service " + str(proc_name) + " - Memory usage", value_mem,"generic_data") + parent[0].update([("unit","%"),("module_parent",str(serv['name']))]) + modules_percentage +=parent + + + for module in modules_default: + print_module(module, 1) + if memcpu: + for module in modules_percentage: + print_module(module, 1) + +def lnx_service(services_list, memcpu=False): + """Creates modules for Linux servers""" + modules = [] + sysctl = getstatusoutput("command -v systemctl")[0] + servic = getstatusoutput("command -v service")[0] + for srvc in services_list: + status = None + if sysctl == 0: + ### Systemd available + syscall = Popen(["systemctl", "show", "-pLoadState", "-pActiveState", srvc], stdout=PIPE, + stdin=DEVNULL, universal_newlines=True) + result = syscall.communicate() + srvstatus = result[0].strip().lower().split("\n") + if srvstatus[0] == "loadstate=not-found": + next + else: + if srvstatus[1] == "activestate=active": + modules += build_module("Service " + srvc + " - Status", 1, "generic_proc") + status = 1 + elif srvstatus[1] == "activestate=inactive": + modules += build_module("Service " +srvc+ " - Status", 0, "generic_proc") + status = 0 + elif sysctl != 0 and servic == 0: + ### Systemd not available, switch to service command + syscall = Popen(["service", srvc, "status"], stdout=PIPE, + stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True) + result = syscall.communicate()[0].lower() + if "is running" in result: + modules += build_module("Service " + srvc + " - Status", 1, "generic_proc") + status = 1 + elif "is stopped" in result: + modules += build_module("Service " +srvc+ " - Status", 0, "generic_proc") + status = 0 else: next - return kids - - @staticmethod - def getstatus(servicename): - """Gets the status of a given Windows service""" - running = Popen(["powershell", "Get-Service", "-Name '" + str(servicename) + - "' |", "Select-Object", "-ExpandProperty", "Status"], - stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True) - status = running.communicate()[0].strip() - return int(status == "Running") - - @staticmethod - def get_serviceprocess(servicename): - """Gets name of the process of the service""" - service = psutil.win_service_get(servicename) - srv_pid = service.pid() - process = psutil.Process(srv_pid) - proc_name = process.name() - return proc_name + else: + print("No systemd or service commands available. Exiting...", file=stderr) + exit() + if status: + module_list.append(srvc) + if memcpu: + modules += get_memcpu(srvc, None) + + for m in modules: + print_module(m, 1) -######################################################################################### -# Services creation -######################################################################################### - -def service_module(name, value, parent=None): +def build_module(name, value, module_type, parent=None): #print ("service_module BEGIN "+str(now(0,1))) module = [{ - "name" : "Service "+ name + " - Status", - "type" : "generic_proc", + "name" : name , + "type" : module_type, "value" : value, "module_parent" : parent, }] @@ -167,74 +169,6 @@ def proc_percentbyname(procname): ############# 03/03/2020 next #print ("proc_percentbyname END "+str(now(0,1))) return [sum(memory),sum(cpu)] - -def win_service(servicelist, option=False, memcpu=False): - """Creates modules for Windows servers.""" - modules = [] - for srvc in servicelist: - if srvc and len(srvc) > 2: - output = PSCheck.check_service(srvc, option, memcpu) - if output is not None and output["modules"]: - modules += PSCheck.check_service(srvc.strip(), option, memcpu)["modules"] - module_list.append(srvc) - #winprocess = output["name"] - #if memcpu == True: - # modules += get_memcpu(winprocess) ## Only available for parent service ATM. - else: - next - else: - next - for module in modules: - print_module(module, 1) - - -def lnx_service(services_list, memcpu=False): - """Creates modules for Linux servers""" - modules = [] - sysctl = getstatusoutput("command -v systemctl")[0] - servic = getstatusoutput("command -v service")[0] - for srvc in services_list: - status = None - if sysctl == 0: - ### Systemd available - syscall = Popen(["systemctl", "show", "-pLoadState", "-pActiveState", srvc], stdout=PIPE, - stdin=DEVNULL, universal_newlines=True) - result = syscall.communicate() - srvstatus = result[0].strip().lower().split("\n") - if srvstatus[0] == "loadstate=not-found": - next - else: - if srvstatus[1] == "activestate=active": - modules += service_module(srvc, 1) - status = 1 - elif srvstatus[1] == "activestate=inactive": - modules += service_module(srvc, 0) - status = 0 - elif sysctl != 0 and servic == 0: - ### Systemd not available, switch to service command - syscall = Popen(["service", srvc, "status"], stdout=PIPE, - stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True) - result = syscall.communicate()[0].lower() - if "is running" in result: - modules += service_module(srvc, 1) - status = 1 - elif "is stopped" in result: - modules += service_module(srvc, 0) - status = 0 - else: - next - else: - print("No systemd or service commands available. Exiting...", file=stderr) - exit() - if status: - module_list.append(srvc) - if memcpu: - modules += get_memcpu(srvc, None) - - for m in modules: - print_module(m, 1) - - ######################################################################################### # print_module function ######################################################################################### @@ -356,6 +290,7 @@ def main(): service_list = ["MySQL", "postgresql", "pgsql", "oracle", "MSSQL", "IISADMIN", "apache", "nginx", "W3svc", "NTDS", "Netlogon", "DNS", "MSExchangeADTopology", "MSExchangeServiceHost", "MSExchangeSA", "MSExchangeTransport"] + discover(OS, service_list) elif psutil.LINUX: OS = "Linux" diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 60ebc7abad..89d354f968 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230313} +{230316} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e7aeba8540..43ade1d81d 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.769 Build 230313") +#define PANDORA_VERSION ("7.0NG.769 Build 230316") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 394e2e2be5..dadfdba481 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.769(Build 230313))" + VALUE "ProductVersion", "(7.0NG.769(Build 230316))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 020733306e..f808e5048e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230313 +Version: 7.0NG.769-230316 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 5a23822ad2..84d810cbb3 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.769-230313" +pandora_version="7.0NG.769-230316" package_pear=0 package_pandora=1 diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php index 9182380a95..3f8170e3c2 100644 --- a/pandora_console/extensions/quick_shell.php +++ b/pandora_console/extensions/quick_shell.php @@ -140,25 +140,26 @@ function quickShell() ui_print_error_message(__('WebService engine has not been started, please check documentation.')); $wiz->printForm( [ - 'form' => [ + 'form' => [ 'method' => 'POST', 'action' => '#', - ], - 'inputs' => [ - [ - 'class' => 'w100p', - 'arguments' => [ - 'name' => 'submit', - 'label' => __('Retry'), - 'type' => 'submit', - 'attributes' => ['icon' => 'next'], - 'return' => true, - ], - ], + 'id' => 'retry_form', ], ] ); + html_print_action_buttons( + html_print_submit_button( + __('Retry'), + 'submit', + false, + [ + 'icon' => 'next', + 'form' => 'retry_form', + ], + true + ) + ); return; } @@ -168,6 +169,7 @@ function quickShell() 'action' => '#', 'class' => 'wizard', 'method' => 'post', + 'id' => 'connect_form', ], 'inputs' => [ [ @@ -198,19 +200,24 @@ function quickShell() 'script' => "p=22; if(this.value == 'telnet') { p=23; } $('#text-port').val(p);", ], ], - [ - 'arguments' => [ - 'type' => 'submit', - 'label' => __('Connect'), - 'attributes' => ['icon' => 'cog'], - ], - ], ], ], false, true ); + html_print_action_buttons( + html_print_submit_button( + __('Connect'), + 'submit', + false, + [ + 'icon' => 'cog', + 'form' => 'connect_form', + ], + true + ) + ); return; } diff --git a/pandora_console/extras/mr/62.sql b/pandora_console/extras/mr/62.sql index 20885d7210..56622e8864 100644 --- a/pandora_console/extras/mr/62.sql +++ b/pandora_console/extras/mr/62.sql @@ -164,4 +164,15 @@ INSERT INTO `twelcome_tip_file` (`twelcome_tip_file`, `filename`, `path`) VALUES (20, 'zoom_en_graficas.png', 'images/tips/'), (22, 'politica_de_pass.png', 'images/tips/'); +ALTER TABLE `tusuario` ADD COLUMN `show_tips_startup` TINYINT UNSIGNED NOT NULL DEFAULT 1; + +CREATE TABLE IF NOT EXISTS `tfavmenu_user` ( + `id` INT NOT NULL AUTO_INCREMENT, + `id_user` VARCHAR(255) NOT NULL, + `id_element` TEXT, + `url` TEXT NOT NULL, + `label` VARCHAR(255) NOT NULL, + `section` VARCHAR(255) NOT NULL, +PRIMARY KEY (`id`)); + COMMIT; diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 40f6c3a382..b0cbc0cec5 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -407,7 +407,6 @@ echo sprintf('
', $menuTypeClass); // User. - // $headerUserImage = (is_user_admin($config['id_user']) === true) ? 'images/header_user_admin_green.png' : 'images/header_user_green.png'; $headerUser = []; $headerUser[] = html_print_image( 'images/edit_user@header.svg', diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index ca213bae37..460f977b9e 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -61,79 +61,110 @@ ui_print_warning_message( $table = new stdClass(); $table->width = '100%'; -$table->class = 'databox filters'; +$table->class = 'databox filter-table-adv mrgn_top_15px pdd_t_0px_important'; $table->data = []; $table->cellpadding = 0; $table->cellspacing = 0; $table->head[0] = __('Agent position'); $table->head_colspan[0] = 4; $table->headstyle[0] = 'text-align:center'; -$table->style[0] = 'font-weight: bold; '; -$table->style[2] = 'font-weight: bold; '; +$table->size[0] = '50%'; +$table->size[2] = '50%'; -$table->data[1][0] = __('Latitude: '); -$table->data[1][1] = html_print_input_text_extended( - 'latitude', - $agentData['stored_latitude'], - 'text-latitude', - '', - 20, - 20, - false, - '', - [ - 'onchange' => 'setIgnoreGISDataEnabled()', - 'onkeyup' => 'setIgnoreGISDataEnabled()', - ], - true +$table->data[1][0] = html_print_label_input_block( + __('Latitude: '), + html_print_input_text_extended( + 'latitude', + $agentData['stored_latitude'], + 'text-latitude', + '', + 20, + 20, + false, + '', + [ + 'onchange' => 'setIgnoreGISDataEnabled()', + 'onkeyup' => 'setIgnoreGISDataEnabled()', + ], + true + ) ); -$table->data[1][2] = __('Longitude: '); -$table->data[1][3] = html_print_input_text_extended( - 'longitude', - $agentData['stored_longitude'], - 'text-longitude', - '', - 20, - 20, - false, - '', - [ - 'onchange' => 'setIgnoreGISDataEnabled()', - 'onkeyup' => 'setIgnoreGISDataEnabled()', - ], - true +$table->data[1][1] = html_print_label_input_block( + __('Longitude: '), + html_print_input_text_extended( + 'longitude', + $agentData['stored_longitude'], + 'text-longitude', + '', + 20, + 20, + false, + '', + [ + 'onchange' => 'setIgnoreGISDataEnabled()', + 'onkeyup' => 'setIgnoreGISDataEnabled()', + ], + true + ) ); -$table->data[2][0] = __('Altitude: '); -$table->data[2][1] = html_print_input_text_extended( - 'altitude', - $agentData['stored_altitude'], - 'text-altitude', - '', - 10, - 10, - false, - '', - [ - 'onchange' => 'setIgnoreGISDataEnabled()', - 'onkeyup' => 'setIgnoreGISDataEnabled()', - ], - true +$table->data[2][0] = html_print_label_input_block( + __('Altitude: '), + html_print_input_text_extended( + 'altitude', + $agentData['stored_altitude'], + 'text-altitude', + '', + 10, + 10, + false, + '', + [ + 'onchange' => 'setIgnoreGISDataEnabled()', + 'onkeyup' => 'setIgnoreGISDataEnabled()', + ], + true + ) ); -$table->data[2][2] = __('Ignore new GIS data:'); -$table->data[2][3] = __('Yes').' '.html_print_radio_button_extended('update_gis_data', 0, '', $updateGisData, false, '', 'class="mrgn_right_40px"', true); -$table->data[2][3] .= __('No').' '.html_print_radio_button_extended('update_gis_data', 1, '', $updateGisData, false, '', 'class="mrgn_right_40px"', true); +$table->data[2][1] = html_print_label_input_block( + __('Ignore new GIS data: '), + '
'.__('Yes').' '.html_print_radio_button_extended( + 'update_gis_data', + 0, + '', + $updateGisData, + false, + '', + 'class="mrgn_right_40px"', + true + ).__('No').' '.html_print_radio_button_extended( + 'update_gis_data', + 1, + '', + $updateGisData, + false, + '', + 'class="mrgn_right_40px"', + true + ).'
' +); $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente; -echo "
"; +echo ""; html_print_input_hidden('update_gis', 1); html_print_table($table); -echo '
'; -html_print_submit_button(__('Update'), '', false, 'class="sub upd"'); -echo '
'; +html_print_action_buttons( + html_print_submit_button( + __('Update'), + '', + false, + ['icon' => 'wand'], + true + ) +); echo '
'; ?> diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 45003b2bc0..a2b0f242da 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -672,10 +672,10 @@ foreach ($simple_alerts as $alert) { '[…]', '' ); - $data[2] .= ' '; $data[2] .= html_print_image( - 'images/zoom.png', + 'images/details.svg', true, [ 'id' => 'template-details-'.$alert['id_alert_template'], @@ -753,7 +753,7 @@ foreach ($simple_alerts as $alert) { 'delete', 'images/delete.svg', 1, - 'padding:0px; margin-left:5px; margin-right:5px;', + 'padding:0px; margin-left:5px; margin-right:5px; width: 22px;', true, [ 'title' => __('Delete action'), @@ -913,7 +913,7 @@ foreach ($simple_alerts as $alert) { 'enable', 'images/lightbulb_off.png', 1, - 'padding:0px', + 'padding:0px; width: 22px; height: 22px;', true, ['class' => 'filter_none main_menu_icon'] ); @@ -923,7 +923,7 @@ foreach ($simple_alerts as $alert) { 'disable', 'images/lightbulb.png', 1, - 'padding:0px;', + 'padding:0px; width: 22px; height: 22px;', true, ['class' => 'main_menu_icon'] ); @@ -941,7 +941,7 @@ foreach ($simple_alerts as $alert) { 'standby_off', 'images/bell.png', 1, - 'padding:0px;', + 'padding:0px; width: 22px; height: 22px;', true, ['class' => 'invert_filter main_menu_icon'] ); @@ -951,7 +951,7 @@ foreach ($simple_alerts as $alert) { 'standby_on', 'images/bell_pause.png', 1, - 'padding:0px;', + 'padding:0px; width: 22px; height: 22px;', true, ['class' => 'invert_filter main_menu_icon'] ); diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 55f786c3c2..23371066c4 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -484,7 +484,7 @@ if (is_metaconsole() === false) { $buttons = [ 'list' => [ 'active' => false, - 'text' => ''.html_print_image('images/load@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'', + 'text' => ''.html_print_image('images/logs@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'', ], 'builder' => [ 'active' => false, @@ -497,44 +497,46 @@ if (is_metaconsole() === false) { $buttons = ''; } - if ($tab === 'list') { - ui_print_standard_header( - __('Alerts'), - 'images/gm_alerts.png', - false, - '', - true, - $buttons, - [ + if ($tab !== 'alert') { + if ($tab === 'list') { + ui_print_standard_header( + __('Alerts'), + 'images/gm_alerts.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('Manage alerts'), - ], + [ + 'link' => '', + 'label' => __('Manage alerts'), + ], + [ + 'link' => '', + 'label' => __('List'), + ], + ] + ); + } else { + ui_print_standard_header( + __('Alerts'), + 'images/gm_alerts.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('List'), - ], - ] - ); - } else { - ui_print_standard_header( - __('Alerts'), - 'images/gm_alerts.png', - false, - '', - true, - $buttons, - [ - [ - 'link' => '', - 'label' => __('Manage alerts'), - ], - [ - 'link' => '', - 'label' => __('Create'), - ], - ] - ); + [ + 'link' => '', + 'label' => __('Manage alerts'), + ], + [ + 'link' => '', + 'label' => __('Create'), + ], + ] + ); + } } } else { alerts_meta_print_header(); diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index 67b31ed3f3..e8b906b220 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -61,13 +61,19 @@ if ($default_action != 0) { } // Header. -ui_print_page_header( +ui_print_standard_header( __('Alert details'), 'images/op_alerts.png', false, '', false, - '' + [], + [ + [ + 'link' => '', + 'label' => __('Alerts'), + ], + ] ); // TABLE DETAILS. diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index aa3a23778d..935d2c1d5d 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -262,10 +262,7 @@ if ($is_management_allowed === true) { [ 'icon' => 'next' ], true ), - [ - 'type' => 'form_action', - 'right_content' => $tablePagination, - ] + [ 'right_content' => $tablePagination ] ); echo ''; diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php index 9a2c9df9f6..2bbbb18077 100644 --- a/pandora_console/godmode/events/event_filter.php +++ b/pandora_console/godmode/events/event_filter.php @@ -59,6 +59,14 @@ if ($delete) { } if ($result !== false) { + db_process_sql_delete( + 'tfavmenu_user', + [ + 'id_element' => $id_filter, + 'section' => 'Events', + 'id_user' => $config['id_user'], + ] + ); $result = true; } else { $result = false; diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 95785a0edd..1afd26363e 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -714,6 +714,14 @@ if ($is_management_allowed === true ); if ($result && (!$usedGroup['return'])) { + db_process_sql_delete( + 'tfavmenu_user', + [ + 'id_element' => $id_group, + 'section' => 'Groups', + 'id_user' => $config['id_user'], + ] + ); ui_print_success_message(__('Group successfully deleted')); } else { ui_print_error_message( @@ -898,7 +906,6 @@ if ($tab == 'tree') { foreach ($groups as $key => $group) { $url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo']; - $url_tactical = 'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$group['id_grupo']; if (is_metaconsole()) { $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups'; } else { @@ -907,7 +914,7 @@ if ($tab == 'tree') { $table->data[$key][0] = $group['id_grupo']; if ($is_management_allowed === true) { - $table->data[$key][1] = ''.$group['nombre'].''; + $table->data[$key][1] = ''.$group['nombre'].''; } else { $table->data[$key][1] = $group['nombre']; } diff --git a/pandora_console/godmode/groups/tactical.php b/pandora_console/godmode/groups/tactical.php index 037af05723..5339590bc4 100644 --- a/pandora_console/godmode/groups/tactical.php +++ b/pandora_console/godmode/groups/tactical.php @@ -72,8 +72,14 @@ if (is_metaconsole() === false) { ], [ 'link' => '', - 'label' => __('Tactic group'), + 'label' => __('Tactical group view'), ], + ], + [ + 'id_element' => $id_group, + 'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group, + 'label' => groups_get_name($id_group), + 'section' => 'Groups', ] ); } @@ -181,7 +187,7 @@ try { [ 'id' => 'list_agents_tactical', 'class' => 'info_table', - 'style' => 'width: 100%', + 'style' => 'width: 99%', 'columns' => $columns, 'column_names' => $columnNames, 'return' => true, @@ -190,6 +196,7 @@ try { 'method' => 'getAgentsByGroup', 'id_group' => $id_group, ], + 'dom_elements' => 'lpfti', 'no_sortable_columns' => [-1], 'order' => [ 'field' => 'alias', diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index b267b40254..1d2bdd48ad 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -1,16 +1,31 @@ 'index.php?sec=main', - 'text' => __('Main'), + 'link' => '', + 'label' => __('Netflow'), ], - [ - 'link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit', - 'text' => __('Netflow filters'), - ], - ]; + ], +); - ui_meta_print_page_header($nav_bar); - - ui_meta_print_header(__('Netflow filters')); +$is_windows = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); +if ($is_windows === true) { + ui_print_error_message(__('Not supported in Windows systems')); } $delete = (bool) get_parameter('delete'); @@ -190,30 +195,37 @@ foreach ($filters as $filter) { if (check_acl_restricted_all($config['id_user'], $filter['id_group'], 'AW')) { $table->cellclass[][3] = 'table_action_buttons'; - $data[3] = "".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).''; + $data[3] = ''; + $data[3] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']); + $data[3] .= ''; } array_push($table->data, $data); } -if (isset($data)) { - echo "
"; +$buttons = html_print_submit_button( + __('Create filter'), + 'crt', + false, + ['icon' => 'wand'], + true +); + +// hd($filters); +if (empty($filters) === false) { + echo ''; html_print_input_hidden('multiple_delete', 1); html_print_table($table); - echo "
"; - - html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); - echo '
'; echo '
'; + $buttons .= html_print_submit_button(__('Delete'), 'delete_btn', false, ['icon' => 'delete', 'mode' => 'secondary', 'form' => 'multiple_delete'], true); } else { ui_print_info_message(['no_close' => true, 'message' => __('There are no defined filters') ]); } echo '
'; -echo "
"; -html_print_submit_button(__('Create filter'), 'crt', false, 'class="sub wand"'); -echo '
'; +html_print_action_buttons( + $buttons +); echo '
'; ?> @@ -221,27 +233,14 @@ echo ''; diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 898c3becda..85d4ecb6c4 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -189,6 +189,14 @@ if ($delete_layout || $copy_layout) { 'tlayout', ['id' => $id_layout] ); + db_process_sql_delete( + 'tfavmenu_user', + [ + 'id_element' => $id_layout, + 'section' => 'Visual_Console', + 'id_user' => $config['id_user'], + ] + ); $auditMessage = ((bool) $result === true) ? 'Delete visual console' : 'Fail try to delete visual console'; db_pandora_audit( diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 15f9e391c3..6b5dda8159 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -875,7 +875,7 @@ if (defined('METACONSOLE')) { ], true ); - $form .= html_print_input_hidden('action', 'filter', true); + $form .= html_print_input_hidden('action', 'sort_items', true); $form .= ''; ui_toggle($form, __('Sort items'), '', '', false); diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 702a4e670b..44199148b6 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -176,6 +176,31 @@ if (is_metaconsole() === true) { ); } +if (is_metaconsole() === true) { + $table->data['description'][0] = __('Description'); + $table->data['description'][1] = html_print_textarea( + 'description', + 2, + 80, + $description, + '', + true + ); +} else { + $table->colspan[1][0] = 2; + $table->data[1][0] = html_print_label_input_block( + __('Description'), + html_print_textarea( + 'description', + 2, + 1, + $description, + '', + true + ) + ); +} + if ($report_id_user == $config['id_user'] || is_user_admin($config['id_user']) ) { @@ -222,7 +247,7 @@ if ($report_id_user == $config['id_user'] $table->data['access'][1] .= '
'; $table->data['access'][1] .= ''; } else { - $table->data[1][0] = html_print_label_input_block( + $table->data[2][0] = html_print_label_input_block( __('Write Access').ui_print_help_tip( __('For example, you want a report that the people of "All" groups can see but you want to edit only for you or your group.'), true @@ -244,7 +269,7 @@ if ($report_id_user == $config['id_user'] $options['div_class'] = ''; } - $table->data[1][1] = html_print_label_input_block( + $table->data[2][1] = html_print_label_input_block( __('Group'), html_print_select_groups( false, @@ -277,7 +302,7 @@ if ($enterpriseEnable) { true ); } else { - $table->data[2][0] = html_print_label_input_block( + $table->data[2][1] = html_print_label_input_block( __('Non interactive report'), html_print_checkbox_switch( 'non_interactive', @@ -289,29 +314,6 @@ if ($enterpriseEnable) { } } -if (is_metaconsole() === true) { - $table->data['description'][0] = __('Description'); - $table->data['description'][1] = html_print_textarea( - 'description', - 2, - 80, - $description, - '', - true - ); -} else { - $table->data[2][1] = html_print_label_input_block( - __('Description'), - html_print_textarea( - 'description', - 2, - 1, - $description, - '', - true - ) - ); -} if (enterprise_installed() === true) { if (is_metaconsole() === true) { diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 688e898c9d..a5705da95a 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -389,7 +389,7 @@ if (empty($create) === false || empty($view) === false) { $disabled = ($locked === true) ? 'readonly="readonly"' : ''; if (empty($create) === true) { - $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin=$plugin_id&pure='.$config['pure']; + $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin='.$plugin_id.'&pure='.$config['pure']; } else { $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&create_plugin=1&pure='.$config['pure']; } @@ -403,69 +403,61 @@ if (empty($create) === false || empty($view) === false) { $table = new stdClass(); $table->id = 'table-form'; - $table->class = 'floating_form'; + $table->class = 'filter-table-adv'; $table->style = []; $table->data['plugin_name_captions'] = $data; - $table->style[0] = 'vertical-align: top'; - $table->style[1] = 'vertical-align: top'; + $table->size[0] = '50%'; + $table->size[1] = '50%'; $table->data = []; // General title. - $generalTitleContent = []; - $generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); - $generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('General')], true); - $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true); + $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('General')], true); $table->data['general_title'] = $data; $data = []; - $data[0] = __('Name'); + $data[0] = html_print_label_input_block( + __('Name'), + html_print_input_text('form_name', $form_name, '', 100, 255, true, false, false, '') + ); $table->data['plugin_name_captions'] = $data; $data = []; - $data[0] = html_print_input_text('form_name', $form_name, '', 100, 255, true, false, false, '', 'w100p'); - $table->data['plugin_name_inputs'] = $data; - $table->colspan['plugin_name_inputs'][0] = 3; + $data[0] = html_print_label_input_block( + __('Plugin type'), + html_print_select($formPluginType, 'form_plugin_type', $form_plugin_type, '', '', 0, true, false, true, '', false, 'width: 100%') + ); - $data = []; - $data[0] = __('Plugin type'); - $data[1] = __('Max. timeout'); - $table->data['plugin_type_timeout_captions'] = $data; - // $table->colspan['plugin_type'][1] = 3; - $data = []; - $data[0] = html_print_select($formPluginType, 'form_plugin_type', $form_plugin_type, '', '', 0, true); $timeoutContent = []; $timeoutContent[] = '
'.html_print_extended_select_for_time('form_max_timeout', $form_max_timeout, '', '', '0', false, true).'
'; $timeoutContent[] = ui_print_input_placeholder(__('This value only will be applied if is minor than the server general configuration plugin timeout').'
'.__('If you set a 0 seconds timeout, the server plugin timeout will be used'), true); - $data[1] = html_print_div( - [ - 'class' => 'flex flex_column', - 'content' => implode('', $timeoutContent), - ], - true + $data[1] = html_print_label_input_block( + __('Max. timeout'), + html_print_div( + [ + 'class' => 'flex flex_column', + 'content' => implode('', $timeoutContent), + ], + true + ) ); - $table->data['plugin_type_timeout_inputs'] = $data; + + $table->data['plugin_type_timeout'] = $data; $data = []; - $data[0] = __('Description'); - $table->data['plugin_desc_captions'] = $data; + $data[0] = html_print_label_input_block( + __('Description'), + html_print_textarea('form_description', 4, 50, $form_description, '', true) + ); - $data = []; - $data[0] = html_print_textarea('form_description', 4, 50, $form_description, '', true, 'w100p'); - $table->colspan['plugin_desc_inputs'][0] = 3; + $table->colspan['plugin_desc_inputs'][0] = 2; $table->data['plugin_desc_inputs'] = $data; - // Command title. - $commandTitleContent = []; - $commandTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); - $commandTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Command')], true); - $data = []; - $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $commandTitleContent) ], true); - $table->data['command_title'] = $data; + // Command title. $data = []; - $data[0] = __('Plugin command').ui_print_help_tip(__('Specify interpreter and plugin path. The server needs permissions to run it.'), true); - $table->data['plugin_command_caption'] = $data; + $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Command')], true); + $table->data['command_title'] = $data; $data = []; $formExecuteContent = []; @@ -480,45 +472,53 @@ if (empty($create) === false || empty($view) === false) { true ); - $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true); + $data[0] = html_print_label_input_block( + __('Plugin command'), + html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true).ui_print_input_placeholder( + __('Specify interpreter and plugin path. The server needs permissions to run it.'), + true + ) + ); + + // $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true); $table->data['plugin_command_inputs'] = $data; $table->colspan['plugin_command_inputs'][0] = 2; $data = []; - $data[0] = __('Plug-in parameters'); - $table->data['plugin_parameters_caption'] = $data; - - $data = []; - $data[0] = html_print_input_text( - 'form_parameters', - $parameters, - '', - 100, - 255, - true, - false, - false, - '', - 'command_component command_advanced_conf text_input w100p' + $data[0] = html_print_label_input_block( + __('Plug-in parameters'), + html_print_input_text( + 'form_parameters', + $parameters, + '', + 100, + 255, + true, + false, + false, + '', + 'command_component command_advanced_conf text_input' + ) ); + $table->data['plugin_parameters_inputs'] = $data; $table->colspan['plugin_parameters_inputs'][0] = 2; $data = []; - $data[0] = __('Command preview'); - $table->data['plugin_preview_captions'] = $data; - $data = []; - - $data[0] = html_print_div(['id' => 'command_preview', 'class' => 'mono'], true); + // $data[0] = __('Command preview'); + // $table->data['plugin_preview_captions'] = $data; + // $data = []; + // $data[0] = html_print_div(['id' => 'command_preview', 'class' => 'mono'], true); + $data[0] = html_print_label_input_block( + __('Command preview'), + html_print_div(['id' => 'command_preview', 'class' => 'mono'], true) + ); $table->data['plugin_preview_inputs'] = $data; $table->colspan['plugin_preview_inputs'][0] = 2; // Parameters macros title. - $macrosTitleContent = []; - $macrosTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true); - $macrosTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Parameters macros')], true); $data = []; - $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $macrosTitleContent) ], true); + $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Parameters macros')], true); $table->data['parameters_macros_title'] = $data; $macros = json_decode($macros, true); @@ -563,53 +563,59 @@ if (empty($create) === false || empty($view) === false) { } $datam = []; - $datam[0] = __('Description')." ($macro_name)"; + $datam[0] = html_print_label_input_block( + __('Description').'('.$macro_name.')', + html_print_input_text_extended($macro_desc_name, $macro_desc_value, 'text-'.$macro_desc_name, '', 30, 255, false, '', "class='command_macro text_input'", true) + ); $datam[0] .= html_print_input_hidden($macro_name_name, $macro_name, true); - $datam[1] = html_print_input_text_extended($macro_desc_name, $macro_desc_value, 'text-'.$macro_desc_name, '', 30, 255, false, '', "class='command_macro text_input'", true); - $datam[2] = __('Default value')." ($macro_name)"; - $datam[3] = html_print_input_text_extended($macro_value_name, $macro_value_value, 'text-'.$macro_value_name, '', 30, 255, false, '', "class='command_component command_macro text_input'", true); + $datam[1] = html_print_label_input_block( + __('Default value').'('.$macro_name.')', + html_print_input_text_extended($macro_value_name, $macro_value_value, 'text-'.$macro_value_name, '', 30, 255, false, '', "class='command_component command_macro text_input'", true) + ); $table->data['plugin_'.$next_name_number] = $datam; $next_name_number++; - $table->colspan['plugin_'.$next_name_number][1] = 3; + $table->colspan['plugin_'.$next_name_number][1] = 2; $datam = []; - $datam[0] = __('Hide value').ui_print_help_tip( - __('This field will show up as dots like a password'), - true - ); - $datam[1] = html_print_checkbox_extended( - $macro_hide_value_name, - 1, - $macro_hide_value_value, - 0, - '', - ['class' => 'command_macro'], - true, - 'checkbox-'.$macro_hide_value_name + $datam = html_print_label_input_block( + __('Hide value'), + html_print_checkbox_switch( + $macro_hide_value_name, + 1, + $macro_hide_value_value, + 0, + '', + ['class' => 'command_macro'], + true, + 'checkbox-'.$macro_hide_value_name + ).ui_print_input_placeholder( + __('This field will show up as dots like a password'), + true + ) ); $table->data['plugin_'.$next_name_number] = $datam; $next_name_number++; - $table->colspan['plugin_'.$next_name_number][1] = 3; - + // $table->colspan['plugin_'.$next_name_number][1] = 3; $datam = []; - $datam[0] = __('Help')." ($macro_name)


"; - $datam[1] = html_print_textarea( - $macro_help_name, - 6, - 100, - $macro_help_value, - 'class="command_macro" class="w97p"', - true + $datam[0] = html_print_label_input_block( + __('Help').' ('.$macro_name.')', + html_print_textarea( + $macro_help_name, + 6, + 100, + $macro_help_value, + 'class="command_macro" class="w97p"', + true + ) ); - $datam[1] .= '


'; - + $table->colspan['plugin_'.$next_name_number][0] = 2; $table->data['plugin_'.$next_name_number] = $datam; $next_name_number++; $i++; @@ -617,7 +623,7 @@ if (empty($create) === false || empty($view) === false) { // Add/Delete buttons $datam = []; - + $buttons = ''; if (!$locked) { $datam[0] = ''.''.__('Add macro').''.' '.html_print_image( 'images/add.png', @@ -627,20 +633,55 @@ if (empty($create) === false || empty($view) === false) { $datam[0] .= ''; $datam[0] .= ''; + $buttons = html_print_anchor( + [ + 'id' => 'add_macro_btn', + 'href' => 'javascript:;', + 'content' => html_print_image( + 'images/plus@svg.svg', + true, + ['class' => 'invert_filter'] + ), + ], + true + ); + + $buttons .= html_print_div(['id' => 'next_macro', 'class' => 'invisible', 'content' => $i], true); + $buttons .= html_print_div(['id' => 'next_row', 'class' => 'invisible', 'content' => $next_name_number], true); + $delete_macro_style = ''; if ($i <= 2) { $delete_macro_style = 'display:none;'; } - $datam[2] = ''; + // $datam[1] = ''; + $buttons .= html_print_anchor( + [ + 'id' => 'delete_macro_button', + 'style' => $delete_macro_style, + 'href' => 'javascript:;', + 'content' => html_print_image( + 'images/delete.svg', + true, + ['class' => 'main_menu_icon invert_filter'] + ), + ], + true + ); + $datam[0] = html_print_div( + [ + 'style' => 'flex-direction: row-reverse;justify-content: flex-start;', + 'content' => $buttons, + ], + true + ); $table->colspan['plugin_action'][0] = 2; - $table->colspan['plugin_action'][2] = 2; } else { - $table->colspan['plugin_action'][0] = 4; + // $table->colspan['plugin_action'][0] = 4; } - $table->rowstyle['plugin_action'] = 'text-align:center'; + // $table->rowstyle['plugin_action'] = 'text-align:center'; $table->data['plugin_action'] = $datam; diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index e693d2f2e2..ae24d914e4 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -251,69 +251,69 @@ if (enterprise_installed()) { switch ($section) { case 'general': $buttons['general']['active'] = true; - $subpage = ' » '.__('General'); + $subpage = __('General'); $help_header = 'setup_general_tab'; break; case 'auth': $buttons['auth']['active'] = true; - $subpage = ' » '.__('Authentication'); + $subpage = __('Authentication'); break; case 'perf': $buttons['perf']['active'] = true; - $subpage = ' » '.__('Performance'); + $subpage = __('Performance'); $help_header = ''; break; case 'vis': $buttons['vis']['active'] = true; - $subpage = ' » '.__('Visual styles'); + $subpage = __('Visual styles'); break; case 'net': $buttons['net']['active'] = true; - $subpage = ' » '.__('Netflow'); + $subpage = __('Netflow'); $help_header = 'setup_netflow_tab'; break; case 'ehorus': $buttons['ehorus']['active'] = true; - $subpage = ' » '.__('eHorus'); + $subpage = __('eHorus'); $help_header = 'setup_ehorus_tab'; break; case 'integria': $buttons['integria']['active'] = true; - $subpage = ' » '.__('Integria IMS'); + $subpage = __('Integria IMS'); $help_header = 'setup_integria_tab'; break; case 'module_library': $buttons['module_library']['active'] = true; - $subpage = ' » '.__('Module Library'); + $subpage = __('Module Library'); $help_header = 'setup_module_library_tab'; break; case 'gis': $buttons['gis']['active'] = true; - $subpage = ' » '.__('Map conections GIS'); + $subpage = __('Map conections GIS'); break; case 'notifications': $buttons['notifications']['active'] = true; - $subpage = ' » '.__('Notifications'); + $subpage = __('Notifications'); break; case 'websocket_engine': $buttons['websocket_engine']['active'] = true; - $subpage = ' » '.__('Pandora Websocket Engine'); + $subpage = __('Pandora Websocket Engine'); $help_header = 'quickshell_settings'; break; case 'external_tools': $buttons['external_tools']['active'] = true; - $subpage = ' » '.__('External Tools'); + $subpage = __('External Tools'); $help_header = ''; break; @@ -327,39 +327,49 @@ switch ($section) { } $buttons['welcome_tips']['active'] = true; - $subpage = ' » '.$title; + $subpage = $title; $help_header = ''; break; case 'enterprise': $buttons['enterprise']['active'] = true; - $subpage = ' » '.__('Enterprise'); + $subpage = __('Enterprise'); $help_header = 'setup_enterprise_tab'; break; + case 'hist_db': + $buttons['hist_db']['active'] = true; + $subpage = __('Historical database'); + $help_header = ''; + break; + + case 'pass': + $buttons['pass']['active'] = true; + $subpage = __('Password policies'); + $help_header = ''; + break; + default: + $subpage = 'seccion: '.$section; // Default. break; } -// Put header inside div for special sizing.(No right margin). -echo '
'; // Header. -ui_print_page_header( - __('Configuration').$subpage, +ui_print_standard_header( + $subpage, '', false, $help_header, true, $buttons, - false, - '', - GENERIC_SIZE_TEXT, - '', - '', - true + [ + [ + 'link' => '', + 'label' => __('Setup'), + ], + ] ); -echo '
'; if (isset($config['error_config_update_config'])) { if ($config['error_config_update_config']['correct'] == false) { diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index d19d3587c6..879eef9ab3 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -14,7 +14,7 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas * Please see http://pandorafms.org for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,6 +26,8 @@ * ============================================================================ */ +use function PHPSTORM_META\map; + // File begin. global $config; @@ -47,153 +49,17 @@ if (is_ajax()) { exit(); } -$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); - -$table = new StdClass(); -$table->class = 'databox filters'; -$table->id = 'setup_general'; -$table->width = '100%'; -$table->data = []; -$table->size = []; -$table->size[0] = '30%'; -$table->style[0] = 'font-weight:bold'; -$table->size[1] = '70%'; - -$table_mail_conf = new stdClass(); -$table_mail_conf->width = '100%'; -$table_mail_conf->class = 'databox filters'; -$table_mail_conf->data = []; -$table_mail_conf->style[0] = 'font-weight: bold'; - -// Current config["language"] could be set by user, not taken from global setup ! -$current_system_lang = db_get_sql( - 'SELECT `value` FROM tconfig WHERE `token` = "language"' -); - -if ($current_system_lang == '') { - $current_system_lang = 'en'; -} - -$i = 0; - -$table->data[$i][0] = __('Language code'); -$table->data[$i++][1] = html_print_select_from_sql( - 'SELECT id_language, name FROM tlanguage', - 'language', - $current_system_lang, - '', - '', - '', - true -); - -$table->data[$i][0] = __('Remote config directory'); -$table->data[$i++][1] = html_print_input_text( - 'remote_config', - io_safe_output($config['remote_config']), - '', - 30, - 100, - true -); - -$table->data[$i][0] = __('Chromium path'); -$table->data[$i++][1] = html_print_input_text( - 'chromium_path', - io_safe_output( - $config['chromium_path'] - ), - '', - 30, - 100, - true -); - -$table->data[$i][0] = __('Auto login (hash) password'); -$table->data[$i][1] = html_print_input_password( - 'loginhash_pwd', - io_output_password($config['loginhash_pwd']), - '', - 15, - 15, - true -); -$table->data[$i++][1] .= ui_print_reveal_password( - 'loginhash_pwd', - true -); - -$table->data[$i][0] = __('Time source'); -$sources['system'] = __('System'); -$sources['sql'] = __('Database'); -$table->data[$i++][1] = html_print_select( - $sources, - 'timesource', - $config['timesource'], - '', - '', - '', - true -); - -$table->data[$i][0] = __('Automatic check for updates'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'autoupdate', - 1, - $config['autoupdate'], - true -); - echo "'; -$table->data[$i][0] = __('Enforce https'); -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'https', - 1, - $config['https'], - false, - '', - '', - true -); +$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control'])); +$sources = []; +$sources['system'] = __('System'); +$sources['sql'] = __('Database'); -$table->data[$i][0] = __('Use cert of SSL'); -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'use_cert', - 1, - $config['use_cert'], - false, - '', - '', - true -); - -$table->rowstyle[$i] = 'display: none;'; -$table->rowid[$i] = 'ssl-path-tr'; -$table->data[$i][0] = __('Path of SSL Cert.'); -$table->data[$i++][1] = html_print_input_text( - 'cert_path', - io_safe_output($config['cert_path']), - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('Attachment store'); -$table->data[$i++][1] = html_print_input_text( - 'attachment_store', - io_safe_output($config['attachment_store']), - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('IP list with API access'); -if (isset($_POST['list_ACL_IPs_for_API'])) { +// ACL Ips for API. +if (isset($_POST['list_ACL_IPs_for_API']) === true) { $list_ACL_IPs_for_API = get_parameter_post('list_ACL_IPs_for_API'); } else { $list_ACL_IPs_for_API = get_parameter_get( @@ -202,51 +68,14 @@ if (isset($_POST['list_ACL_IPs_for_API'])) { ); } -$table->data[$i++][1] = html_print_textarea( - 'list_ACL_IPs_for_API', - 2, - 25, - $list_ACL_IPs_for_API, - 'class="height_130px w300px"', - true -); - -$table->data[$i][0] = __('API password'); -$table->data[$i][1] = html_print_input_password( - 'api_password', - io_output_password($config['api_password']), - '', - 25, - 255, - true -); -$table->data[$i++][1] .= ui_print_reveal_password('api_password', true); - -$table->data[$i][0] = __('Enable GIS features'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'activate_gis', - 1, - $config['activate_gis'], - true -); - -$table->data[$i][0] = __('Enable Netflow'); -$rbt_disabled = false; +// Enable Netflow. if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { $rbt_disabled = true; +} else { + $rbt_disabled = false; } -$table->data[$i++][1] = html_print_checkbox_switch_extended( - 'activate_netflow', - 1, - $config['activate_netflow'], - $rbt_disabled, - '', - '', - true -); - - +// Zone names. $zone_name = [ 'Africa' => __('Africa'), 'America' => __('America'), @@ -278,83 +107,16 @@ foreach ($timezones as $timezone) { } } -$table->data[$i][0] = __('Timezone setup'); -$table->data[$i][1] = html_print_input_text_extended( - 'timezone_text', - $config['timezone'], - 'text-timezone_text', - '', - 25, - 25, - false, - '', - 'readonly', - true -); -$table->data[$i][1] .= ''.html_print_image( - 'images/edit.svg', - true, +// Force Public URL Dialog. +html_print_div( [ - 'title' => __('Change timezone'), - 'class' => 'main_menu_icon invert_filter', - ] -).''; -$table->data[$i][1] .= '  '.html_print_select( - $zone_name, - 'zone', - $zone_selected, - 'show_timezone();', - '', - '', - true -); -$table->data[$i++][1] .= '  '.html_print_select( - $timezone_n, - 'timezone', - $config['timezone'], - '', - '', - '', - true -); - -$table->data[$i][0] = __('Public URL'); -$table->data[$i++][1] = html_print_input_text( - 'public_url', - $config['public_url'], - '', - 40, - 255, - true -); - -$table->data[$i][0] = __('Force use Public URL'); -$table->data[$i++][1] = html_print_switch( - [ - 'name' => 'force_public_url', - 'value' => $config['force_public_url'], + 'id' => 'force_public_url_dialog', + 'class' => 'invisible', + 'content' => __('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console'), ] ); -echo "'; - -$table->data[$i][0] = __('Public URL host exclusions'); -$table->data[$i++][1] = html_print_textarea( - 'public_url_exclusions', - 2, - 25, - $config['public_url_exclusions'], - 'class="height_50px w300px"', - true -); - -// Inventory changes blacklist. -$table->data[$i][0] = __('Inventory changes blacklist'); - +// Inventory blacklist. $inventory_changes_blacklist_id = get_parameter( 'inventory_changes_blacklist', $config['inventory_changes_blacklist'] @@ -431,171 +193,492 @@ $table_ichanges = '
'; -$table->data[$i++][1] = $table_ichanges; - -$table->data[$i][0] = __('Referer security'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'referer_security', - 1, - $config['referer_security'], - true -); - -$table->data[$i][0] = __('Event storm protection'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'event_storm_protection', - 1, - $config['event_storm_protection'], - true -); - - -$table->data[$i][0] = __('Command Snapshot'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'command_snapshot', - 1, - $config['command_snapshot'], - true -); - -$table->data[$i][0] = __('Change remote config encoding'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'use_custom_encoding', - 1, - $config['use_custom_encoding'], - true -); - -$table->data[$i][0] = __('Server logs directory'); -$table->data[$i++][1] = html_print_input_text( - 'server_log_dir', - $config['server_log_dir'], - '', - 50, - 255, - true -); - -$table->data[$i][0] = __('Log size limit in system logs viewer extension'); -$table->data[$i++][1] = html_print_input_text( - 'max_log_size', - $config['max_log_size'], - '', - 10, - 255, - true -).html_print_label(' x1000', 'max_log_size', true); - $modes_tutorial = [ 'full' => __('Full mode'), 'on_demand' => __('On demand'), 'expert' => __('Expert'), ]; -$table->data[$i][0] = __('Tutorial mode'); -$table->data[$i++][1] = html_print_select( - $modes_tutorial, - 'tutorial_mode', - $config['tutorial_mode'], - '', - '', - 0, - true -); $config['past_planned_downtimes'] = isset( $config['past_planned_downtimes'] ) ? $config['past_planned_downtimes'] : 1; -$table->data[$i][0] = __('Allow create scheduled downtimes in the past'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'past_planned_downtimes', - 1, - $config['past_planned_downtimes'], - true + +$table = new stdClass(); +$table->class = 'filter-table-adv'; +$table->id = 'setup_general'; +$table->width = '100%'; +$table->data = []; +$table->size = []; +$table->size[0] = '50%'; +$table->size[1] = '50%'; + +// Current config["language"] could be set by user, not taken from global setup ! +$current_system_lang = db_get_sql( + 'SELECT `value` FROM tconfig WHERE `token` = "language"' ); -$table->data[$i][0] = __('Limit for bulk operations'); -$table->data[$i++][1] = html_print_input( +if ($current_system_lang === '') { + $current_system_lang = 'en'; +} + +$i = 0; + +$table->data[$i][] = html_print_label_input_block( + __('Language code'), + html_print_select_from_sql( + 'SELECT id_language, name FROM tlanguage', + 'language', + $current_system_lang, + '', + '', + '', + true, + false, + true, + false, + 'width:100%' + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Remote config directory'), + html_print_input_text( + 'remote_config', + io_safe_output($config['remote_config']), + '', + 30, + 100, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Chromium path'), + html_print_input_text( + 'chromium_path', + io_safe_output( + $config['chromium_path'] + ), + '', + 30, + 100, + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Auto login (hash) password'), + html_print_input_password( + 'loginhash_pwd', + io_output_password($config['loginhash_pwd']), + '', + 15, + 15, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Time source'), + html_print_select( + $sources, + 'timesource', + $config['timesource'], + '', + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Attachment store'), + html_print_input_text( + 'attachment_store', + io_safe_output($config['attachment_store']), + '', + 50, + 255, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Enforce https'), + html_print_checkbox_switch_extended( + 'https', + 1, + $config['https'], + false, + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Automatic check for updates'), + html_print_checkbox_switch( + 'autoupdate', + 1, + $config['autoupdate'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Use cert of SSL'), + html_print_checkbox_switch_extended( + 'use_cert', + 1, + $config['use_cert'], + false, + '', + '', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Path of SSL Cert.'), + html_print_input_text( + 'cert_path', + io_safe_output($config['cert_path']), + '', + 50, + 255, + true + ), [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['limit_parameters_massive']->max, - 'name' => 'limit_parameters_massive', - 'value' => $config['limit_parameters_massive'], - 'return' => true, - 'min' => $performance_variables_control['limit_parameters_massive']->min, - 'style' => 'width:50px', + 'div_id' => 'ssl-path-tr', + 'div_style' => 'display: none', ] ); -$table->data[$i][0] = __('Include agents manually disabled'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'include_agents', - 1, - $config['include_agents'], - true +$table->data[$i][] = html_print_label_input_block( + __('API password'), + html_print_input_password( + 'api_password', + io_output_password($config['api_password']), + '', + 25, + 255, + true + ) ); -$table->data[$i][0] = __('Set alias as name by default in agent creation'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'alias_as_name', - 1, - $config['alias_as_name'], - true +$table->data[$i++][] = html_print_label_input_block( + __('IP list with API access'), + html_print_textarea( + 'list_ACL_IPs_for_API', + 2, + 25, + $list_ACL_IPs_for_API, + 'class="height_130px"', + true + ) ); -$table->data[$i][0] = __('Unique IP'); -$table->data[$i++][1] = html_print_checkbox_switch( - 'unique_ip', - 1, - $config['unique_ip'], - true + +$table->data[$i][] = html_print_label_input_block( + __('Enable GIS features'), + html_print_checkbox_switch( + 'activate_gis', + 1, + $config['activate_gis'], + true + ) ); -$table->data[$i][0] = __('Enable console log').ui_print_help_tip( - __('Log location').': pandora_console/log/console.log', - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'console_log_enabled', - 1, - $config['console_log_enabled'], - true +$table->data[$i++][] = html_print_label_input_block( + __('Enable Netflow'), + html_print_checkbox_switch_extended( + 'activate_netflow', + 1, + $config['activate_netflow'], + $rbt_disabled, + '', + '', + true + ) ); -$table->data[$i][0] = __('Enable audit log').ui_print_help_tip( - __('Log location').': pandora_console/log/audit.log', - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'audit_log_enabled', - 1, - $config['audit_log_enabled'], - true +$table->colspan[$i][] = 2; +$table->data[$i++][] = html_print_label_input_block( + __('Timezone setup'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text_extended( + 'timezone_text', + $config['timezone'], + 'text-timezone_text', + '', + 25, + 25, + false, + '', + 'readonly', + true + ).html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'change_timezone', + 'title' => __('Change timezone'), + 'class' => 'main_menu_icon invert_filter', + ] + ).html_print_select( + $zone_name, + 'zone', + $zone_selected, + 'show_timezone();', + '', + '', + true + ).html_print_select( + $timezone_n, + 'timezone', + $config['timezone'], + '', + '', + '', + true + ), + ], + true + ) ); -$table->data[$i][0] = __('Module custom ID readonly').ui_print_help_tip( - __('Useful for integrations'), - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'module_custom_id_ro', - 1, - $config['module_custom_id_ro'], - true +$table->data[$i][] = html_print_label_input_block( + __('Public URL'), + html_print_input_text( + 'public_url', + $config['public_url'], + '', + 40, + 255, + true + ) ); -$table->data[$i][0] = __('Enable console report').ui_print_help_tip( +$table->data[$i++][] = html_print_label_input_block( + __('Force use Public URL'), + html_print_switch( + [ + 'name' => 'force_public_url', + 'value' => $config['force_public_url'], + ] + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Public URL host exclusions'), + html_print_textarea( + 'public_url_exclusions', + 2, + 25, + $config['public_url_exclusions'], + 'class="height_50px w300px"', + true + ) +); + +// Inventory changes blacklist. +$table->data[$i][] = html_print_label_input_block( + __('Inventory changes blacklist'), + $table_ichanges +); + +$table->data[$i++][] = html_print_label_input_block( + __('Server logs directory'), + html_print_input_text( + 'server_log_dir', + $config['server_log_dir'], + '', + 50, + 255, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Event storm protection'), + html_print_checkbox_switch( + 'event_storm_protection', + 1, + $config['event_storm_protection'], + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Command Snapshot'), + html_print_checkbox_switch( + 'command_snapshot', + 1, + $config['command_snapshot'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Change remote config encoding'), + html_print_checkbox_switch( + 'use_custom_encoding', + 1, + $config['use_custom_encoding'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Referer security'), + html_print_checkbox_switch( + 'referer_security', + 1, + $config['referer_security'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Log size limit in system logs viewer extension'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_input_text( + 'max_log_size', + $config['max_log_size'], + '', + 20, + 255, + true + ).html_print_label( + ' x1000', + 'max_log_size', + true + ), + ], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Tutorial mode'), + html_print_select( + $modes_tutorial, + 'tutorial_mode', + $config['tutorial_mode'], + '', + '', + 0, + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Allow create scheduled downtimes in the past'), + html_print_checkbox_switch( + 'past_planned_downtimes', + 1, + $config['past_planned_downtimes'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Limit for bulk operations'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['limit_parameters_massive']->max, + 'name' => 'limit_parameters_massive', + 'value' => $config['limit_parameters_massive'], + 'return' => true, + 'min' => $performance_variables_control['limit_parameters_massive']->min, + 'style' => 'width:50%', + ] + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Include agents manually disabled'), + html_print_checkbox_switch( + 'include_agents', + 1, + $config['include_agents'], + true + ) +); +$table->data[$i++][] = html_print_label_input_block( + __('Set alias as name by default in agent creation'), + html_print_checkbox_switch( + 'alias_as_name', + 1, + $config['alias_as_name'], + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Unique IP'), + html_print_checkbox_switch( + 'unique_ip', + 1, + $config['unique_ip'], + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Module custom ID readonly'), + html_print_checkbox_switch( + 'module_custom_id_ro', + 1, + $config['module_custom_id_ro'], + true + ).ui_print_input_placeholder( + __('Useful for integrations'), + true + ) +); + +$table->data[$i][] = html_print_label_input_block( + __('Enable console log'), + html_print_checkbox_switch( + 'console_log_enabled', + 1, + $config['console_log_enabled'], + true + ).ui_print_input_placeholder( + __('Log location').': pandora_console/log/console.log', + true + ) +); + +$table->data[$i++][] = html_print_label_input_block( + __('Enable audit log'), + html_print_checkbox_switch( + 'audit_log_enabled', + 1, + $config['audit_log_enabled'], + true + ).ui_print_input_placeholder( + __('Log location').': pandora_console/log/audit.log', + true + ) +); + +$table->data[$i][] = html_print_label_input_block( __('Enable console report'), - true -); -$table->data[$i++][1] = html_print_checkbox_switch( - 'reporting_console_enable', - 1, - $config['reporting_console_enable'], - true + html_print_checkbox_switch( + 'reporting_console_enable', + 1, + $config['reporting_console_enable'], + true + ) ); -echo '
'; +echo ''; echo '
'; echo ''.__('General options').''; @@ -615,7 +698,7 @@ echo '
'; echo '
'; echo ''.__('Mail configuration').''; - $table_mail_conf->data[0][0] = ui_print_warning_message( + ui_print_warning_message( __( 'Please notice that some providers like Gmail or Office365 need to setup/enable manually external connections using SMTP and you need to use STARTTLS on port 587. @@ -623,114 +706,128 @@ echo ''.__('Mail configuration').''; ) ); - $table_mail_conf->data[1][0] = __('From address'); - $table_mail_conf->data[1][1] = html_print_input_text( - 'email_from_dir', - $config['email_from_dir'], - '', - 30, - 100, - true + $table_mail_conf = new stdClass(); + $table_mail_conf->width = '100%'; + $table_mail_conf->class = 'databox filter-table-adv'; + $table_mail_conf->size = []; + $table_mail_conf->size[0] = '50%'; + $table_mail_conf->size[1] = '50%'; + $table_mail_conf->data = []; + + $table_mail_conf->data[0][] = html_print_label_input_block( + __('From address'), + html_print_input_text( + 'email_from_dir', + $config['email_from_dir'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[2][0] = __('From name'); - $table_mail_conf->data[2][1] = html_print_input_text( - 'email_from_name', - $config['email_from_name'], - '', - 30, - 100, - true + $table_mail_conf->data[0][] = html_print_label_input_block( + __('From name'), + html_print_input_text( + 'email_from_name', + $config['email_from_name'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[3][0] = __('SMTP Server'); - $table_mail_conf->data[3][1] = html_print_input_text( - 'email_smtpServer', - $config['email_smtpServer'], - '', - 30, - 100, - true + $table_mail_conf->data[1][] = html_print_label_input_block( + __('SMTP Server'), + html_print_input_text( + 'email_smtpServer', + $config['email_smtpServer'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[4][0] = __('SMTP Port'); - $table_mail_conf->data[4][1] = html_print_input_text( - 'email_smtpPort', - $config['email_smtpPort'], - '', - 30, - 100, - true + $table_mail_conf->data[1][] = html_print_label_input_block( + __('SMTP Port'), + html_print_input_text( + 'email_smtpPort', + $config['email_smtpPort'], + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[5][0] = __('Encryption'); - $table_mail_conf->data[5][1] = html_print_select( - $encryption, - 'email_encryption', - $config['email_encryption'], - '', - __('none'), - 0, - true + $table_mail_conf->data[2][] = html_print_label_input_block( + __('Email user'), + html_print_input_text( + 'email_username', + $config['email_username'], + '', + 30, + 100, + true + ) + ); + $table_mail_conf->data[2][] = html_print_label_input_block( + __('Email password'), + html_print_input_password( + 'email_password', + io_output_password( + $config['email_password'] + ), + '', + 30, + 100, + true + ) ); - $table_mail_conf->data[6][0] = __('Email user'); - $table_mail_conf->data[6][1] = html_print_input_text( - 'email_username', - $config['email_username'], - '', - 30, - 100, - true - ); - - $table_mail_conf->data[7][0] = __('Email password'); - $table_mail_conf->data[7][1] = html_print_input_password( - 'email_password', - io_output_password( - $config['email_password'] - ), - '', - 30, - 100, - true - ); - $table_mail_conf->data[7][1] .= ui_print_reveal_password( - 'email_password', - true + $table_mail_conf->data[3][] = html_print_label_input_block( + __('Encryption'), + html_print_select( + $encryption, + 'email_encryption', + $config['email_encryption'], + '', + __('none'), + 0, + true + ) ); $uniqid = uniqid(); - $table_mail_conf->data[8][0] = html_print_button( - __('Email test'), - 'email_test_dialog', - false, - "show_email_test('".$uniqid."');", - [ 'icon' => 'next' ], - true - ); - print_email_test_modal_window($uniqid); html_print_input_hidden('update_config', 1); html_print_table($table_mail_conf); - echo '
'; - html_print_div( - [ - 'class' => 'action-buttons w100p', - 'content' => html_print_submit_button( - __('Update'), - 'update_button', - false, - ['icon' => 'update'], - true - ), - ] + html_print_action_buttons( + html_print_submit_button( + __('Update'), + 'update_button', + false, + ['icon' => 'update'], + true + ).html_print_button( + __('Email test'), + 'email_test_dialog', + false, + 'show_email_test("'.$uniqid.'");', + [ + 'icon' => 'mail', + 'mode' => 'secondary', + ], + true + ) ); echo '
'; @@ -748,26 +845,27 @@ echo ''.__('Mail configuration').''; // Email config table. $table_mail_test = new stdClass(); $table_mail_test->width = '100%'; - $table_mail_test->class = 'databox filters'; + $table_mail_test->class = 'filter-table-adv'; $table_mail_test->data = []; - $table_mail_test->style[0] = 'font-weight: bold;'; - $table_mail_test->style[1] = 'font-weight: bold;display: flex;height: 54px;align-items: center;padding-left: 15px;'; - $table_mail_test->data[0][0] = __('Address'); - $table_mail_test->data[0][1] = html_print_input_text( - 'email_test_address', - '', - '', - 35, - 100, - true + $table_mail_test->data[0][] = html_print_label_input_block( + __('Address'), + html_print_input_text( + 'email_test_address', + '', + '', + 35, + 100, + true + ) ); - $table_mail_test->data[1][0] = '  Email could not be sent'; + $table_mail_test->data[1][] = '  Email could not be sent'; - $table_mail_test->data[1][1] = html_print_div( + // $table_mail_test->colspan[2][0] = 2; + $submitButton = html_print_div( [ - 'class' => 'action-buttons w100p', + 'class' => 'action-buttons-right-forced', 'content' => html_print_button( __('Send'), 'email_test', @@ -783,7 +881,7 @@ echo ''.__('Mail configuration').''; true ); - echo ''; + echo ''; } diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 5fb042fe66..2b5c553ca1 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -1,16 +1,31 @@ width = '100%'; -$table_behaviour->class = 'databox filters'; -$table_behaviour->style[0] = 'font-weight: bold;'; -$table_behaviour->size[0] = '50%'; -$table_behaviour->data = []; - -$table_behaviour->data[$row][0] = __('Block size for pagination'); -$table_behaviour->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['block_size']->max, - 'name' => 'block_size', - 'value' => $config['global_block_size'], - 'return' => true, - 'min' => $performance_variables_control['block_size']->min, - 'style' => 'width:50px', - ] -); -$row++; - $values = []; $values[5] = human_time_description_raw(5); $values[30] = human_time_description_raw(30); @@ -89,178 +82,87 @@ $values[SECONDS_5MINUTES] = human_time_description_raw(SECONDS_5MINUTES); $values[SECONDS_10MINUTES] = human_time_description_raw(SECONDS_10MINUTES); $values[SECONDS_30MINUTES] = human_time_description_raw(SECONDS_30MINUTES); -$table_behaviour->data[$row][0] = __('Paginated module view'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'paginate_module', - 1, - $config['paginate_module'], - true +$table_behaviour = new stdClass(); +$table_behaviour->width = '100%'; +$table_behaviour->class = 'filter-table-adv'; +$table_behaviour->size[0] = '50%'; +$table_behaviour->data = []; + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Block size for pagination'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['block_size']->max, + 'name' => 'block_size', + 'value' => $config['global_block_size'], + 'return' => true, + 'min' => $performance_variables_control['block_size']->min, + 'style' => 'width:50px', + ] + ) +); + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Click to display lateral menus'), + html_print_checkbox_switch( + 'click_display', + 1, + $config['click_display'], + true + ) +); + +$row++; + +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Paginated module view'), + html_print_checkbox_switch( + 'paginate_module', + 1, + $config['paginate_module'], + true + ) +); +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display data of proc modules in other format'), + html_print_checkbox_switch( + 'render_proc', + 1, + $config['render_proc'], + true + ) ); $row++; -$table_behaviour->data[$row][0] = __('Display data of proc modules in other format'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'render_proc', - 1, - $config['render_proc'], - true +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display text proc modules have state is ok'), + html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true) ); -$row++; - -$table_behaviour->data[$row][0] = __('Display text proc modules have state is ok'); -$table_behaviour->data[$row][1] = html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true); -$row++; - -$table_behaviour->data[$row][0] = __('Display text when proc modules have state critical'); -$table_behaviour->data[$row][1] = html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true); -$row++; - -$table_behaviour->data[$row][0] = __('Click to display lateral menus'); -$table_behaviour->data[$row][1] = html_print_checkbox_switch( - 'click_display', - 1, - $config['click_display'], - true +$table_behaviour->data[$row][] = html_print_label_input_block( + __('Display text when proc modules have state critical'), + html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true) ); $row++; if (enterprise_installed() === true) { - $table_behaviour->data[$row][0] = __('Service label font size'); - $table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true); - $row++; - - $table_behaviour->data[$row][0] = __('Space between items in Service maps'); - $table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"'); $row++; + $table_behaviour->data[$row][] = html_print_label_input_block( + __('Service label font size'), + html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true) + ); + $table_behaviour->data[$row][] = html_print_label_input_block( + __('Space between items in Service maps'), + html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"') + ); } + // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // STYLE CONFIGURATION // ---------------------------------------------------------------------- -$table_styles = new stdClass(); -$table_styles->width = '100%'; -$table_styles->class = 'databox filters'; -$table_styles->style[0] = 'font-weight: bold;'; -$table_styles->style[1] = 'display: flex; align-items: center;'; -$table_styles->size[0] = '50%'; -$table_styles->data = []; - - -$table_styles->data[$row][0] = __('Style template'); -$table_styles->data[$row][1] = html_print_select( - themes_get_css(), - 'style', - $config['style'].'.css', - '', - '', - '', - true -); -$row++; - -$table_styles->data[$row][0] = __('Status icon set'); -$iconsets['default'] = __('Colors'); -$iconsets['faces'] = __('Faces'); -$iconsets['color_text'] = __('Colors and text'); -$table_styles->data[$row][1] = html_print_select( - $iconsets, - 'status_images_set', - $config['status_images_set'], - '', - '', - '', - true -); -$table_styles->data[$row][1] .= html_print_button( - __('View'), - 'status_set_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; - -// Divs to show icon status Colours (Default). -$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); -$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); -$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); -$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true); -$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true); -$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); -$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); -$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); -// End - Divs to show icon status Colours (Default). -$table_styles->data[$row][0] = __('Login background'); -$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); -$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); -$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); -$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png); -$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif); -asort($backgrounds_list); - -$open = false; -if (enterprise_installed() === false) { - $open = true; -} - -// Custom favicon. -$files = list_files('images/custom_favicon', 'ico', 1, 0); -$table_styles->data[$row][0] = __('Custom favicon'); -$table_styles->data[$row][1] = html_print_select( - $files, - 'custom_favicon', - $config['custom_favicon'], - 'setup_visuals_change_favicon();', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' -); -$table_styles->data[$row][1] .= '   '.html_print_image( - ui_get_favicon(), - true, - ['id' => 'favicon_preview'] -); -$row++; - -$table_styles->data[$row][0] = __('Custom background logo'); -$table_styles->data[$row][1] = html_print_select( - $backgrounds_list, - 'login_background', - $config['login_background'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' -); -$table_styles->data[$row][1] .= html_print_button( - __('View'), - 'login_background_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; /** @@ -311,1369 +213,7 @@ function logo_custom_enterprise($name, $logo) } -$table_styles->data[$row][0] = __('Custom logo (menu)'); -$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo', $config['custom_logo']); -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo collapsed (menu)'); -$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']); -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_collapsed_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo (header white background)'); -if (enterprise_installed() === true) { - $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0); - $open_files = list_files('images/custom_logo', 'png', 1, 0); - - $table_styles->data[$row][1] = html_print_select( - array_merge($open_files, $ent_files), - 'custom_logo_white_bg', - $config['custom_logo_white_bg'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} else { - $table_styles->data[$row][1] = html_print_select( - list_files('images/custom_logo', 'png', 1, 0), - 'custom_logo_white_bg', - $config['custom_logo_white_bg'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} - -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_white_bg_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -$table_styles->data[$row][0] = __('Custom logo (login)'); - -if (enterprise_installed()) { - $table_styles->data[$row][1] = html_print_select( - list_files('enterprise/images/custom_logo_login', 'png', 1, 0), - 'custom_logo_login', - $config['custom_logo_login'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} else { - $table_styles->data[$row][1] = html_print_select( - '', - 'custom_logo_login', - $config['custom_logo_login'], - '', - '', - '', - true, - false, - true, - '', - $open, - 'width:240px' - ); -} - -$table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_logo_login_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' -); -$row++; - -// Splash login. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Custom Splash (login)'); - - $table_styles->data[$row][1] = html_print_select( - list_files('enterprise/images/custom_splash_login', 'png', 1, 0), - 'custom_splash_login', - $config['custom_splash_login'], - '', - __('Default'), - 'default', - true, - false, - true, - '', - $open, - 'width:240px' - ); - - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_splash_login_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; -} - -if (enterprise_installed() === true) { - // Get all the custom logos. - $files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); - - // Custom docs icon. - $table_styles->data[$row][0] = __('Custom documentation logo'); - - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_docs_logo', - $config['custom_docs_logo'], - '', - __('None'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_docs_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom support icon. - $table_styles->data[$row][0] = __('Custom support logo'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_support_logo', - $config['custom_support_logo'], - '', - __('None'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_support_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom center networkmap icon. - $table_styles->data[$row][0] = __('Custom networkmap center logo'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_network_center_logo', - $config['custom_network_center_logo'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_network_center_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; - - // Custom center mobile console icon. - $table_styles->data[$row][0] = __('Custom mobile console icon'); - $table_styles->data[$row][1] = html_print_select( - $files, - 'custom_mobile_console_logo', - $config['custom_mobile_console_logo'], - '', - __('Default'), - '', - true, - false, - true, - '', - false, - 'width:240px' - ); - $table_styles->data[$row][1] .= ' '.html_print_button( - __('View'), - 'custom_mobile_console_logo_preview', - $open, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true, - false, - $open, - 'visualmodal' - ); - $row++; -} - -// Title Header. -$table_styles->data[$row][0] = __('Title (header)'); -$table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true); -$row++; - -// Subtitle Header. -$table_styles->data[$row][0] = __('Subtitle (header)'); -$table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true); -$row++; - -// Login title1. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Title 1 (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true); - $row++; -} - -// Login text2. -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Title 2 (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Docs URL (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Support URL (login)'); - $table_styles->data[$row][1] = html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Product name'); - $table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Copyright notice'); - $table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true); - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Background opacity % (login)'); - $table_styles->data[$row][1] = ""; - $row++; -} - -if (enterprise_installed() === true) { - $table_styles->data[$row][0] = __('Disable logo in graphs'); - $table_styles->data[$row][1] = html_print_checkbox_switch( - 'fixed_graph', - 1, - $config['fixed_graph'], - true - ); - $row++; -} - - /* - Hello there! :) - We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( - You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. - */ - -$table_styles->data[$row][0] = __('Disable helps'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'disable_help', - 1, - $config['disable_help'], - true -); -$row++; - -$table_styles->data[$row][0] = __('Fixed header'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'fixed_header', - 1, - $config['fixed_header'], - true -); -$row++; - - -// For 5.1 Autohidden menu feature. -$table_styles->data['autohidden'][0] = __('Automatically hide submenu'); -$table_styles->data['autohidden'][1] = html_print_checkbox_switch( - 'autohidden_menu', - 1, - $config['autohidden_menu'], - true -); - -$table_styles->data[$row][0] = __('Visual effects and animation'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'visual_animation', - 1, - $config['visual_animation'], - true -); -$row++; - -$table_styles->data[$row][0] = __('Random background (login)'); -$table_styles->data[$row][1] = html_print_checkbox_switch( - 'random_background', - 1, - $config['random_background'], - true -); -$row++; - - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// GIS CONFIGURATION -// ---------------------------------------------------------------------- -$table_gis = new stdClass(); -$table_gis->width = '100%'; -$table_gis->class = 'databox filters'; -$table_gis->style[0] = 'font-weight: bold;'; -$table_gis->style[1] = 'display: flex; align-items: center;'; -$table_gis->size[0] = '50%'; -$table_gis->data = []; - -$table_gis->data[$row][0] = __('GIS Labels'); -$table_gis->data[$row][1] = html_print_checkbox_switch( - 'gis_label', - 1, - $config['gis_label'], - true -); -$row++; - -$listIcons = gis_get_array_list_icons(); -$arraySelectIcon = []; -foreach ($listIcons as $index => $value) { - $arraySelectIcon[$index] = $index; -} - -$table_gis->data[$row][0] = __('Default icon in GIS'); -$table_gis->data[$row][1] = html_print_select( - $arraySelectIcon, - 'gis_default_icon', - $config['gis_default_icon'], - '', - __('Agent icon group'), - '', - true -); -$table_gis->data[$row][1] .= ' '.html_print_button( - __('View'), - 'gis_icon_preview', - false, - '', - [ - 'icon' => 'camera', - 'mode' => 'link', - 'class' => 'logo_preview', - ], - true -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// FONT AND TEXT CONFIGURATION -// ---------------------------------------------------------------------- -$table_font = new stdClass(); -$table_font->width = '100%'; -$table_font->class = 'databox filters'; -$table_font->style[0] = 'font-weight: bold;'; -$table_font->size[0] = '50%'; -$table_font->data = []; - -$table_font->data[$row][0] = __('Graphs font size'); - -$font_size_array = [ - 1 => 1, - 2 => 2, - 3 => 3, - 4 => 4, - 5 => 5, - 6 => 6, - 7 => 7, - 8 => 8, - 9 => 9, - 10 => 10, - 11 => 11, - 12 => 12, - 13 => 13, - 14 => 14, - 15 => 15, -]; - -$table_font->data[$row][1] = html_print_select( - $font_size_array, - 'font_size', - $config['font_size'], - '', - '', - 0, - true -); -$row++; - -$table_font->data[$row][0] = __('Agent size text'); -$table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true); -$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Module size text'); -$table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true); -$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Description size text'); -$table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true); -$row++; - -$table_font->data[$row][0] = __('Item title size text'); -$table_font->data[$row][1] = html_print_input_text( - 'item_title_size_text', - $config['item_title_size_text'], - '', - 3, - 3, - true -); -$row++; - -$table_font->data[$row][0] = __('Show unit along with value in reports'); -$table_font->data[$row][1] = html_print_checkbox_switch( - 'simple_module_value', - 1, - $config['simple_module_value'], - true -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// CHARS CONFIGURATION -// ---------------------------------------------------------------------- -$table_chars = new stdClass(); -$table_chars->width = '100%'; -$table_chars->class = 'databox filters'; -$table_chars->style[0] = 'font-weight: bold;'; -$table_chars->style[1] = 'display: flex;'; -$table_chars->size[0] = '50%'; -$table_chars->data = []; - -$graphColorAmount = 10; - -for ($i = 1; $i <= $graphColorAmount; $i++) { - $table_chars->data[$row][0] = __('Graph color #'.$i); - $table_chars->data[$row][1] = html_print_input_text( - 'graph_color'.$i, - $config['graph_color'.$i], - '', - 10, - 8, - true - ); - $row++; -} - -$table_chars->data[$row][0] = __('Value to interface graphics'); -$table_chars->data[$row][1] = html_print_input_text( - 'interface_unit', - $config['interface_unit'], - '', - 20, - 20, - true -); -$row++; - -$disabled_graph_precision = false; -if (enterprise_installed() === false) { - $disabled_graph_precision = true; -} - -$table_chars->data[$row][0] = __('Data precision'); -$table_chars->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['graph_precision']->max, - 'name' => 'graph_precision', - 'value' => $config['graph_precision'], - 'return' => true, - 'min' => $performance_variables_control['graph_precision']->min, - 'style' => 'width:50px', - ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', - 'onchange' => 'change_precision()', - ] -); -$row++; - -if (isset($config['short_module_graph_data']) === false) { - $config['short_module_graph_data'] = true; -} - -$table_chars->data[$row][0] = __('Data precision in graphs'); -$table_chars->data[$row][1] = html_print_input( - [ - 'type' => 'number', - 'size' => 5, - 'max' => $performance_variables_control['short_module_graph_data']->max, - 'name' => 'short_module_graph_data', - 'value' => $config['short_module_graph_data'], - 'return' => true, - 'min' => $performance_variables_control['short_module_graph_data']->min, - 'style' => 'width:50px', - ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', - 'onchange' => 'change_precision()', - ] -); - -$row++; - -$table_chars->data[$row][0] = __( - 'Default line thickness for the Custom Graph.' -); -$table_chars->data[$row][1] = html_print_input_text( - 'custom_graph_width', - $config['custom_graph_width'], - '', - 5, - 5, - true -); -$row++; - -$table_chars->data[$row][0] = __('Number of elements in Custom Graph'); -$table_chars->data[$row][1] = html_print_input_text( - 'items_combined_charts', - $config['items_combined_charts'], - '', - 5, - 5, - true, - false, - false, - '' -); -$row++; - -$table_chars->data[$row][0] = __('Use round corners'); -$table_chars->data[$row][1] = html_print_checkbox_switch( - 'round_corner', - 1, - $config['round_corner'], - true -); -$row++; - -$table_chars->data[$row][0] = __('Chart fit to content'); -$table_chars->data[$row][1] = html_print_checkbox_switch( - 'maximum_y_axis', - 1, - $config['maximum_y_axis'], - true -); -$row++; - -$table_chars->data[$row][0] = __('Type of module charts'); -$table_chars->data[$row][1] = __('Area').' '.html_print_radio_button( - 'type_module_charts', - 'area', - '', - $config['type_module_charts'] == 'area', - true -).'  '; -$table_chars->data[$row][1] .= __('Line').' '.html_print_radio_button( - 'type_module_charts', - 'line', - '', - $config['type_module_charts'] != 'area', - true -); -$row++; - -$table_chars->data[$row][0] = __('Type of interface charts'); -$table_chars->data[$row][1] = __('Area').' '.html_print_radio_button( - 'type_interface_charts', - 'area', - '', - $config['type_interface_charts'] == 'area', - true -).'  '; -$table_chars->data[$row][1] .= __('Line').' '.html_print_radio_button( - 'type_interface_charts', - 'line', - '', - $config['type_interface_charts'] != 'area', - true -); -$row++; - -$table_chars->data[$row][0] = __('Percentile'); -$table_chars->data[$row][1] = html_print_input_text( - 'percentil', - $config['percentil'], - '', - 20, - 20, - true -); -$row++; - -$table_chars->data[$row][0] = __('Graph TIP view:'); - -$options_full_escale = []; -$options_full_escale[0] = __('None'); -$options_full_escale[1] = __('All'); -$options_full_escale[2] = __('On Boolean graphs'); - -$table_chars->data[$row][1] = html_print_select( - $options_full_escale, - 'full_scale_option', - (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0, - '', - '', - 0, - true, - false, - false -); -$row++; - - -$table_chars->data[$row][0] = __('Graph mode'); - -$options_soft_graphs = []; -$options_soft_graphs[0] = __('Show only average by default'); -$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default'); - -$table_chars->data[$row][1] = html_print_select( - $options_soft_graphs, - 'type_mode_graph', - (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0, - '', - '', - 0, - true, - false, - false -); -$row++; - -$table_chars->data[$row][0] = __('Zoom graphs:'); - -$options_zoom_graphs = []; -$options_zoom_graphs[1] = 'x1'; -$options_zoom_graphs[2] = 'x2'; -$options_zoom_graphs[3] = 'x3'; -$options_zoom_graphs[4] = 'x4'; -$options_zoom_graphs[5] = 'x5'; - -$table_chars->data[$row][1] = html_print_select( - $options_zoom_graphs, - 'zoom_graph', - $config['zoom_graph'], - '', - '', - 0, - true, - false, - false -); -$row++; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// Visual Consoles -// ---------------------------------------------------------------------- -$table_vc = new stdClass(); -$table_vc->width = '100%'; -$table_vc->class = 'databox filters'; -$table_vc->style[0] = 'font-weight: bold'; -$table_vc->size[0] = '50%'; -$table_vc->data = []; - -// Remove when the new view reaches rock solid stability. -$table_vc->data[$row][0] = __('Legacy Visual Console View'); -$table_vc->data[$row][1] = html_print_checkbox_switch( - 'legacy_vc', - 1, - (bool) $config['legacy_vc'], - true -); -$row++; - -$intervals = [ - 10 => '10 '.__('seconds'), - 30 => '30 '.__('seconds'), - 60 => '1 '.__('minutes'), - 300 => '5 '.__('minutes'), - 900 => '15 '.__('minutes'), - 1800 => '30 '.__('minutes'), - 3600 => '1 '.__('hour'), -]; -$table_vc->data[$row][0] = __('Default cache expiration'); -$table_vc->data[$row][1] = html_print_extended_select_for_time( - 'vc_default_cache_expiration', - $config['vc_default_cache_expiration'], - '', - __('No cache'), - 0, - false, - true, - false, - false, - '', - false, - $intervals -); -$row++; - -$table_vc->data[$row][0] = __('Default interval for refresh on Visual Console'); -$table_vc->data[$row][1] = html_print_select( - $values, - 'vc_refr', - (int) $config['vc_refr'], - '', - 'N/A', - 0, - true, - false, - false -); -$row++; - -$vc_favourite_view_array[0] = __('Classic view'); -$vc_favourite_view_array[1] = __('View of favorites'); -$table_vc->data[$row][0] = __('Type of view of visual consoles'); -$table_vc->data[$row][1] = html_print_select( - $vc_favourite_view_array, - 'vc_favourite_view', - $config['vc_favourite_view'], - '', - '', - 0, - true -); -$row++; - -$table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu'); -$table_vc->data[$row][1] = ""; -$row++; - -$table_vc->data[$row][0] = __('Default line thickness for the Visual Console'); -$table_vc->data[$row][1] = html_print_input_text( - 'vc_line_thickness', - (int) $config['vc_line_thickness'], - '', - 5, - 5, - true -); - -$table_vc->data[$row][0] = __('Mobile view not allow visual console orientation'); -$table_vc->data[$row][1] = html_print_checkbox_switch( - 'mobile_view_orientation_vc', - 1, - (bool) $config['mobile_view_orientation_vc'], - true -); -$row++; - - -// ---------------------------------------------------------------------- -// Services -// ---------------------------------------------------------------------- -$table_ser = new stdClass(); -$table_ser->width = '100%'; -$table_ser->class = 'databox filters'; -$table_ser->style[0] = 'font-weight: bold'; -$table_ser->size[0] = '50%'; -$table_ser->data = []; - -$table_ser->data['number'][0] = __('Number of favorite services to show in the menu'); -$table_ser->data['number'][1] = ""; - -// ---------------------------------------------------------------------- -// Reports -// ---------------------------------------------------------------------- -$table_report = new stdClass(); -$table_report->width = '100%'; -$table_report->class = 'databox filters'; -$table_report->style[0] = 'font-weight: bold;'; -$table_report->size[0] = '20%'; - -$table_report->data = []; - -$table_report->data[$row][0] = __('Show report info with description'); -$table_report->data[$row][1] = html_print_checkbox_switch( - 'custom_report_info', - 1, - $config['custom_report_info'], - true -); -$row++; - -$table_report->data[$row][0] = __('Custom report front page'); -$table_report->data[$row][1] = html_print_checkbox_switch( - 'custom_report_front', - 1, - $config['custom_report_front'], - true -); - -$row++; - -$table_report->data[$row][0] = __('PDF font size (px)'); -$table_report->data[$row][1] = ""; - -$row++; - -$table_report->data[$row][0] = __('HTML font size for SLA (em)'); -$table_report->data[$row][1] = ""; - -$row++; - -$table_report->data[$row][0] = __('Graph image height for HTML reports'); -$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true); - -$row++; - -$interval_description = [ - 'large' => 'Long', - 'tiny' => 'Short', -]; -$table_report->data[$row][0] = __('Interval description'); -$table_report->data[$row][1] = html_print_select( - $interval_description, - 'interval_description', - (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large', - '', - '', - '', - true, - false, - false -); - -$row++; - -// ---------------------------------------------------------------------- -$dirItems = scandir($config['homedir'].'/images/custom_logo'); -foreach ($dirItems as $entryDir) { - if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) { - $customLogos['images/custom_logo/'.$entryDir] = $entryDir; - } -} - -// Logo. -$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( - __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), - true -); - -$table_report->data['custom_report_front-logo'][1] = html_print_select( - $customLogos, - 'custom_report_front_logo', - io_safe_output($config['custom_report_front_logo']), - 'showPreview()', - __('Default'), - '', - true -); -// Preview. -$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview'; -if (empty($config['custom_report_front_logo'])) { - $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; -} - -$table_report->data['custom_report_front-preview'][1] = ''.html_print_image($config['custom_report_front_logo'], true).''; - -// Header. -$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header'); - -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -$table_report->data['custom_report_front-header'][1] = html_print_textarea( - 'custom_report_front_header', - 5, - 15, - io_safe_output($config['custom_report_front_header']), - 'class="w90p height_300px"', - true -); - -// First page. -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -if ($config['custom_report_front']) { - $firstpage_content = $config['custom_report_front_firstpage']; -} else { - $firstpage_content = io_safe_output($config['custom_report_front_firstpage']); -} - -$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page'); -$custom_report_front_firstpage = str_replace( - '(_URLIMAGE_)', - ui_get_full_url(false, true, false, false), - io_safe_output($firstpage_content) -); -$table_report->data['custom_report_front-first_page'][1] = html_print_textarea( - 'custom_report_front_firstpage', - 15, - 15, - $custom_report_front_firstpage, - 'class="w90p height_300px"', - true -); - -// Footer. -$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer'); - -// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. -$table_report->data['custom_report_front-footer'][1] = html_print_textarea( - 'custom_report_front_footer', - 5, - 15, - io_safe_output($config['custom_report_front_footer']), - 'class="w90p height_300px""', - true -); - - -// ---------------------------------------------------------------------- -// OTHER CONFIGURATION -// ---------------------------------------------------------------------- -$table_other = new stdClass(); -$table_other->width = '100%'; -$table_other->class = 'databox filters'; -$table_other->style[0] = 'font-weight: bold;'; -$table_other->size[0] = '50%'; -$table_other->size[1] = '26%'; -$table_other->size[2] = '12%'; -$table_other->size[3] = '12%'; -$table_other->data = []; - -$row++; - -$table_other->data[$row][0] = __('Networkmap max width'); -$table_other->data[$row][1] = html_print_input_text( - 'networkmap_max_width', - $config['networkmap_max_width'], - '', - 10, - 20, - true -); -$row++; - -$table_other->data[$row][0] = __('Show only the group name'); -$table_other->data[$row][1] = html_print_checkbox_switch( - 'show_group_name', - 1, - $config['show_group_name'], - true -); -$row++; - -$table_other->data[$row][0] = __('Show empty groups in group view'); -$table_other->data[$row][1] = html_print_checkbox_switch( - 'show_empty_groups', - 1, - $config['show_empty_groups'], - true -); -$row++; - -$table_other->data[$row][0] = __('Date format string'); -$table_other->data[$row][1] = ''.__('Example').' '.date($config['date_format']); -$table_other->data[$row][1] .= html_print_input_text('date_format', $config['date_format'], '', 30, 100, true); -$row++; - -$decimal_separators = [ - ',' => ',', - '.' => '.', -]; - -$table_other->data[$row][0] = __('Decimal separator'); -$table_other->data[$row][1] = html_print_select( - $decimal_separators, - 'decimal_separator', - $config['decimal_separator'], - '', - '', - '', - true, - false, - false -); - -$row++; - -$table_other->data[$row][0] = __('Visible time of successful notifiations'); -$table_other->data[$row][1] .= html_print_input_text('notification_autoclose_time', $config['notification_autoclose_time'], '', 10, 10, true); -$row++; - -if ($config['prominent_time'] === 'comparation') { - $timestamp = false; - $comparation = true; - $compact = false; -} else if ($config['prominent_time'] === 'timestamp') { - $timestamp = true; - $comparation = false; - $compact = false; -} else if ($config['prominent_time'] === 'compact') { - $timestamp = false; - $comparation = false; - $compact = true; -} - -$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode'); -$table_other->data[$row][1] = '
'; -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true); -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true); -$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true); -$table_other->data[$row][1] .= '
'; - -$row++; - -// ---------------------------------------------------------------------- -// CUSTOM VALUES POST PROCESS -// ---------------------------------------------------------------------- -$table_other->data[$row][0] = __('Custom values post process'); -$table_other->data[$row][1] = __('Value').': '.html_print_input_text('custom_value', '', '', 25, 50, true); -$table_other->data[$row][2] = __('Text').': '.html_print_input_text('custom_text', '', '', 15, 50, true); -$table_other->data[$row][2] .= ' '; -$table_other->data[$row][2] .= html_print_input_hidden( - 'custom_value_add', - '', - true -); -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'custom_value_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; - -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete custom values').': '; -$table_other->data[$row][2] = html_print_select( - post_process_get_custom_values(), - 'custom_values', - '', - '', - '', - '', - true -); -$count_custom_postprocess = post_process_get_custom_values(); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'custom_values_del_btn', - empty($count_custom_postprocess), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); -// This hidden field will be filled from jQuery before submit. -$table_other->data[$row][1] .= html_print_input_hidden( - 'custom_value_to_delete', - '', - true -); -$table_other->data[$row][3] .= '

'; - -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- -// CUSTOM INTERVAL VALUES -// ---------------------------------------------------------------------- -$row++; -$table_other->data[$row][0] = __('Interval values'); -$units = [ - 1 => __('seconds'), - SECONDS_1MINUTE => __('minutes'), - SECONDS_1HOUR => __('hours'), - SECONDS_1DAY => __('days'), - SECONDS_1MONTH => __('months'), - SECONDS_1YEAR => __('years'), -]; -$table_other->data[$row][1] = __('Value').': '; -$table_other->data[$row][1] .= html_print_input_text('interval_value', '', '', 5, 5, true); -$table_other->data[$row][2] = html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false); -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'interval_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; - -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete interval').': '; -$table_other->data[$row][2] = html_print_select(get_periods(false, false), 'intervals', '', '', '', '', true); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'interval_del_btn', - empty($config['interval_values']), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); - -$table_other->data[$row][1] .= html_print_input_hidden('interval_values', $config['interval_values'], true); -// This hidden field will be filled from jQuery before submit. -$table_other->data[$row][1] .= html_print_input_hidden('interval_to_delete', '', true); -$table_other->data[$row][3] .= '

'; -// ---------------------------------------------------------------------- -$row++; - -$table_other->data[$row][0] = __('Module units'); -$table_other->data[$row][1] = __('Value').': '; -$table_other->data[$row][1] .= html_print_input_text('custom_module_unit', '', '', 15, 50, true); -$table_other->data[$row][2] = ''; -$table_other->data[$row][3] = html_print_button( - __('Add'), - 'module_unit_add_btn', - false, - '', - [ - 'icon' => 'next', - 'mode' => 'link', - ], - true -); - -$row++; -$table_other->data[$row][0] = ''; -$table_other->data[$row][1] = __('Delete custom values').': '; -$table_other->data[$row][2] = html_print_select(get_custom_module_units(), 'module_units', '', '', '', '', true, false, true, 'w100p'); -$table_other->data[$row][3] = html_print_button( - __('Delete'), - 'custom_module_unit_del_btn', - empty($count_custom_postprocess), - '', - [ - 'icon' => 'delete', - 'mode' => 'link', - ], - true -); - -$table_other->data[$row][3] .= html_print_input_hidden( - 'custom_module_unit_to_delete', - '', - true -); - -$row++; - -$common_dividers = [ - ';' => ';', - ',' => ',', - '|' => '|', -]; -$table_other->data[$row][0] = __('CSV divider'); -if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['csv_divider'] != '|') { - $table_other->data[$row][1] = html_print_input_text( - 'csv_divider', - $config['csv_divider'], - '', - 20, - 255, - true - ); - $table_other->data[$row][1] .= ''.html_print_image( - 'images/logs@svg.svg', - true, - [ - 'id' => 'select', - 'class' => 'main_menu_icon invert_filter', - ] - ).''; -} else { - $table_other->data[$row][1] = html_print_select( - $common_dividers, - 'csv_divider', - $config['csv_divider'], - '', - '', - '', - true, - false, - false - ); - $table_other->data[$row][1] .= ''.html_print_image( - 'images/edit.svg', - true, - [ - 'id' => 'pencil', - 'class' => 'main_menu_icon invert_filter', - ] - ).''; -} - -$row++; - -$decimal_separator = [ - '.' => '.', - ',' => ',', -]; -$table_other->data[$row][0] = __('CSV decimal separator'); -$table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false); - -$row++; - -$table_other->data[$row][0] = __('Data multiplier to use in graphs/data'); -$options_data_multiplier = []; -$options_data_multiplier[0] = __('Use 1024 when module unit are bytes'); -$options_data_multiplier[1] = __('Use always 1000'); -$options_data_multiplier[2] = __('Use always 1024'); - - -$table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false);function load_fonts() +function load_fonts() { global $config; @@ -1692,68 +232,1828 @@ $table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_d } +$iconsets['default'] = __('Colors'); +$iconsets['faces'] = __('Faces'); +$iconsets['color_text'] = __('Colors and text'); + +// Divs to show icon status Colours (Default). +$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); +$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); +$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); +$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true); +$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true); +$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); +$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); +$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); +// End - Divs to show icon status Colours (Default). +$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); +$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); +$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); +$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png); +$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif); +asort($backgrounds_list); + +$open = false; +if (enterprise_installed() === false) { + $open = true; +} + +if (enterprise_installed() === true) { + // Get all the custom logos. + $filesCustomLogos = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); + + $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0); + $open_files = list_files('images/custom_logo', 'png', 1, 0); + + $entOpenFilesInput = html_print_select( + array_merge($open_files, $ent_files), + 'custom_logo_white_bg', + $config['custom_logo_white_bg'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); + + $customLogoLoginInput = html_print_select( + list_files('enterprise/images/custom_logo_login', 'png', 1, 0), + 'custom_logo_login', + $config['custom_logo_login'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); +} else { + $entOpenFilesInput = html_print_select( + list_files('images/custom_logo', 'png', 1, 0), + 'custom_logo_white_bg', + $config['custom_logo_white_bg'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); + + $customLogoLoginInput = html_print_select( + '', + 'custom_logo_login', + $config['custom_logo_login'], + '', + '', + '', + true, + false, + true, + '', + $open, + 'width:240px' + ); +} + +// Custom favicon. +$filesFavicon = list_files('images/custom_favicon', 'ico', 1, 0); + +$table_styles = new stdClass(); +$table_styles->width = '100%'; +$table_styles->class = 'filter-table-adv'; +$table_styles->size[0] = '50%'; +$table_styles->data = []; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Style template'), + html_print_select( + themes_get_css(), + 'style', + $config['style'].'.css', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ) +); +$row++; +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom favicon'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesFavicon, + 'custom_favicon', + $config['custom_favicon'], + 'setup_visuals_change_favicon();', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_image( + ui_get_favicon(), + true, + ['id' => 'favicon_preview'] + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom background logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $backgrounds_list, + 'login_background', + $config['login_background'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'login_background_preview', + false, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true + ), + ], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (menu)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => logo_custom_enterprise('custom_logo', $config['custom_logo']).html_print_button( + __('View'), + 'custom_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo collapsed (menu)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']).html_print_button( + __('View'), + 'custom_logo_collapsed_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (header white background)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => $entOpenFilesInput.html_print_button( + __('View'), + 'custom_logo_white_bg_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Custom logo (login)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => $entOpenFilesInput.html_print_button( + __('View'), + 'custom_logo_login_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) +); +$row++; + +// Splash login. +if (enterprise_installed() === true) { + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom Splash (login)'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + list_files('enterprise/images/custom_splash_login', 'png', 1, 0), + 'custom_splash_login', + $config['custom_splash_login'], + '', + __('Default'), + 'default', + true, + false, + true, + '', + $open, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_splash_login_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom documentation logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_docs_logo', + $config['custom_docs_logo'], + '', + __('None'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_docs_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + $row++; + + // Custom support icon. + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom support logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_support_logo', + $config['custom_support_logo'], + '', + __('None'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_support_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom networkmap center logo'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_network_center_logo', + $config['custom_network_center_logo'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_network_center_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); + $row++; + + // Custom center mobile console icon. + $table_styles->data[$row][] = html_print_label_input_block( + __('Custom mobile console icon'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $filesCustomLogos, + 'custom_mobile_console_logo', + $config['custom_mobile_console_logo'], + '', + __('Default'), + '', + true, + false, + true, + '', + false, + 'width:240px' + ).html_print_button( + __('View'), + 'custom_mobile_console_logo_preview', + $open, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true, + false, + $open, + 'visualmodal' + ), + ], + true + ) + ); +} + +$row++; + +// Title Header. +$table_styles->data[$row][] = html_print_label_input_block( + __('Title (header)'), + html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true) +); + +// Subtitle Header. +$table_styles->data[$row][] = html_print_label_input_block( + __('Subtitle (header)'), + html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true) +); +$row++; + +if (enterprise_installed() === true) { + // Login title1. + $table_styles->data[$row][] = html_print_label_input_block( + __('Title 1 (login)'), + html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true) + ); + // Login text2. + $table_styles->data[$row][] = html_print_label_input_block( + __('Title 2 (login)'), + html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Docs URL (login)'), + html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Support URL (login)'), + html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Product name'), + html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true) + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Copyright notice'), + html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true) + ); + $row++; + + $table_styles->data[$row][] = html_print_label_input_block( + __('Background opacity % (login)'), + "" + ); + + $table_styles->data[$row][] = html_print_label_input_block( + __('Disable logo in graphs'), + html_print_checkbox_switch( + 'fixed_graph', + 1, + $config['fixed_graph'], + true + ) + ); + $row++; +} + +/* + Hello there! :) + We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :( + You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years. +*/ + +$table_styles->data[$row][] = html_print_label_input_block( + __('Disable helps'), + html_print_checkbox_switch( + 'disable_help', + 1, + $config['disable_help'], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Fixed header'), + html_print_checkbox_switch( + 'fixed_header', + 1, + $config['fixed_header'], + true + ) +); +$row++; + +// For 5.1 Autohidden menu feature. +$table_styles->data[$row][] = html_print_label_input_block( + __('Automatically hide submenu'), + html_print_checkbox_switch( + 'autohidden_menu', + 1, + $config['autohidden_menu'], + true + ) +); + +$table_styles->data[$row][] = html_print_label_input_block( + __('Visual effects and animation'), + html_print_checkbox_switch( + 'visual_animation', + 1, + $config['visual_animation'], + true + ) +); +$row++; + +$table_styles->data[$row][] = html_print_label_input_block( + __('Random background (login)'), + html_print_checkbox_switch( + 'random_background', + 1, + $config['random_background'], + true + ) +); + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// GIS CONFIGURATION +// ---------------------------------------------------------------------- +$listIcons = gis_get_array_list_icons(); +$arraySelectIcon = []; +foreach ($listIcons as $index => $value) { + $arraySelectIcon[$index] = $index; +} + +$table_gis = new stdClass(); +$table_gis->width = '100%'; +$table_gis->class = 'filter-table-adv'; +$table_gis->size[0] = '50%'; +$table_gis->data = []; + +$table_gis->data[$row][] = html_print_label_input_block( + __('GIS Labels'), + html_print_checkbox_switch( + 'gis_label', + 1, + $config['gis_label'], + true + ) +); + +$table_gis->data[$row][] = html_print_label_input_block( + __('Default icon in GIS'), + html_print_div( + [ + 'class' => 'select-with-sibling', + 'content' => html_print_select( + $arraySelectIcon, + 'gis_default_icon', + $config['gis_default_icon'], + '', + __('Agent icon group'), + '', + true + ).html_print_button( + __('View'), + 'gis_icon_preview', + false, + '', + [ + 'icon' => 'camera', + 'mode' => 'link', + 'class' => 'logo_preview', + ], + true + ), + ], + true + ) +); +$row++; + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// FONT AND TEXT CONFIGURATION +// ---------------------------------------------------------------------- +$font_size_array = [ + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, +]; + +$table_font = new stdClass(); +$table_font->width = '100%'; +$table_font->class = 'filter-table-adv'; +$table_font->size[0] = '50%'; +$table_font->data = []; + +$table_font->data[$row][] = html_print_label_input_block( + __('Graphs font size'), + html_print_select( + $font_size_array, + 'font_size', + $config['font_size'], + '', + '', + 0, + true, + false, + true, + '', + false, + 'width: 100%' + ) +); + + +$table_font->data[$row][] = html_print_label_input_block( + __('Show unit along with value in reports'), + html_print_checkbox_switch( + 'simple_module_value', + 1, + $config['simple_module_value'], + true + ) +); +$row++; + +$table_font->data[$row][] = html_print_label_input_block( + __('Agent size text'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Small').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 10, 3, true), + ], + true + ).html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Normal').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 10, 3, true), + ], + true + ), + ], + true + ) +); +$table_font->data[$row][] = html_print_label_input_block( + __('Module size text'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Small').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 10, 3, true), + ], + true + ).html_print_div( + [ + 'class' => 'w50p', + 'content' => __('Normal').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 10, 3, true), + ], + true + ), + ], + true + ) +); +$row++; + +$table_font->data[$row][] = html_print_label_input_block( + __('Description size text'), + html_print_input_text( + 'description_size_text', + $config['description_size_text'], + '', + 3, + 3, + true + ) +); +$table_font->data[$row][] = html_print_label_input_block( + __('Item title size text'), + html_print_input_text( + 'item_title_size_text', + $config['item_title_size_text'], + '', + 3, + 3, + true + ) +); +$row++; + + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// CHARS CONFIGURATION +// ---------------------------------------------------------------------- +$disabled_graph_precision = false; +if (enterprise_installed() === false) { + $disabled_graph_precision = true; +} + +if (isset($config['short_module_graph_data']) === false) { + $config['short_module_graph_data'] = true; +} + +$options_full_escale = []; +$options_full_escale[0] = __('None'); +$options_full_escale[1] = __('All'); +$options_full_escale[2] = __('On Boolean graphs'); + +$options_soft_graphs = []; +$options_soft_graphs[0] = __('Show only average by default'); +$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default'); + +$options_zoom_graphs = []; +$options_zoom_graphs[1] = 'x1'; +$options_zoom_graphs[2] = 'x2'; +$options_zoom_graphs[3] = 'x3'; +$options_zoom_graphs[4] = 'x4'; +$options_zoom_graphs[5] = 'x5'; + +$graphColorAmount = 10; +$table_chars = new stdClass(); +$table_chars->width = '100%'; +$table_chars->class = 'filter-table-adv'; +$table_chars->size[0] = '50%'; +$table_chars->size[1] = '50%'; +$table_chars->data = []; + +for ($i = 1; $i <= $graphColorAmount; $i++) { + $table_chars->data[$row][] = html_print_label_input_block( + __('Graph color #'.$i), + html_print_input_color( + 'graph_color'.$i, + $config['graph_color'.$i], + 'graph_color'.$i, + 'w50p', + true + ) + ); + + $row = ($i % 2 === 0) ? ($row + 1) : $row; +} + +$table_chars->data[$row][] = html_print_label_input_block( + __('Data precision'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['graph_precision']->max, + 'name' => 'graph_precision', + 'value' => $config['graph_precision'], + 'return' => true, + 'min' => $performance_variables_control['graph_precision']->min, + 'style' => 'width:50%', + ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', + 'onchange' => 'change_precision()', + ] + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Data precision in graphs'), + html_print_input( + [ + 'type' => 'number', + 'size' => 5, + 'max' => $performance_variables_control['short_module_graph_data']->max, + 'name' => 'short_module_graph_data', + 'value' => $config['short_module_graph_data'], + 'return' => true, + 'min' => $performance_variables_control['short_module_graph_data']->min, + 'style' => 'width:50%', + ($disabled_graph_precision) ? 'readonly' : '' => 'readonly', + 'onchange' => 'change_precision()', + ] + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Value to interface graphics'), + html_print_input_text( + 'interface_unit', + $config['interface_unit'], + '', + 20, + 20, + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Default line thickness for the Custom Graph.'), + html_print_input_text( + 'custom_graph_width', + $config['custom_graph_width'], + '', + 5, + 5, + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Number of elements in Custom Graph'), + html_print_input_text( + 'items_combined_charts', + $config['items_combined_charts'], + '', + 5, + 5, + true, + false, + false, + '' + ) +); +$table_chars->data[$row][] = html_print_label_input_block( + __('Use round corners'), + html_print_checkbox_switch( + 'round_corner', + 1, + $config['round_corner'], + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Chart fit to content'), + html_print_checkbox_switch( + 'maximum_y_axis', + 1, + $config['maximum_y_axis'], + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Type of module charts'), + html_print_div( + [ + 'class' => '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Area').' '.html_print_radio_button( + 'type_module_charts', + 'area', + '', + $config['type_module_charts'] == 'area', + true + ), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Line').' '.html_print_radio_button( + 'type_module_charts', + 'line', + '', + $config['type_module_charts'] != 'area', + true + ), + ], + true + ), + ], + true + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Percentile'), + html_print_input_text( + 'percentil', + $config['percentil'], + '', + 20, + 20, + true + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Graph TIP view'), + html_print_select( + $options_full_escale, + 'full_scale_option', + (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0, + '', + '', + 0, + true, + false, + false + ) +); +$row++; + +$table_chars->data[$row][] = html_print_label_input_block( + __('Graph mode'), + html_print_select( + $options_soft_graphs, + 'type_mode_graph', + (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0, + '', + '', + 0, + true, + false, + false + ) +); + +$table_chars->data[$row][] = html_print_label_input_block( + __('Zoom graphs'), + html_print_select( + $options_zoom_graphs, + 'zoom_graph', + $config['zoom_graph'], + '', + '', + 0, + true, + false, + false + ) +); +$row++; + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// Visual Consoles +// ---------------------------------------------------------------------- +$intervals = [ + 10 => '10 '.__('seconds'), + 30 => '30 '.__('seconds'), + 60 => '1 '.__('minutes'), + 300 => '5 '.__('minutes'), + 900 => '15 '.__('minutes'), + 1800 => '30 '.__('minutes'), + 3600 => '1 '.__('hour'), +]; + +$vc_favourite_view_array[0] = __('Classic view'); +$vc_favourite_view_array[1] = __('View of favorites'); + +$table_vc = new stdClass(); +$table_vc->width = '100%'; +$table_vc->class = 'filter-table-adv'; +$table_vc->style[0] = 'font-weight: bold'; +$table_vc->size[0] = '50%'; +$table_vc->data = []; + +// Remove when the new view reaches rock solid stability. +$table_vc->data[$row][] = html_print_label_input_block( + __('Legacy Visual Console View'), + html_print_checkbox_switch( + 'legacy_vc', + 1, + (bool) $config['legacy_vc'], + true + ) +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default cache expiration'), + html_print_extended_select_for_time( + 'vc_default_cache_expiration', + $config['vc_default_cache_expiration'], + '', + __('No cache'), + 0, + false, + true, + false, + false, + '', + false, + $intervals + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default interval for refresh on Visual Console'), + html_print_select( + $values, + 'vc_refr', + (int) $config['vc_refr'], + '', + 'N/A', + 0, + true, + false, + false + ) +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Type of view of visual consoles'), + html_print_select( + $vc_favourite_view_array, + 'vc_favourite_view', + $config['vc_favourite_view'], + '', + '', + 0, + true + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Number of favorite visual consoles to show in the menu'), + "" +); + +$table_vc->data[$row][] = html_print_label_input_block( + __('Default line thickness for the Visual Console'), + html_print_input_text( + 'vc_line_thickness', + (int) $config['vc_line_thickness'], + '', + 5, + 5, + true + ) +); +$row++; + +$table_vc->data[$row][] = html_print_label_input_block( + __('Mobile view not allow visual console orientation'), + html_print_checkbox_switch( + 'mobile_view_orientation_vc', + 1, + (bool) $config['mobile_view_orientation_vc'], + true + ) +); +$row++; + + +// ---------------------------------------------------------------------- +// Services +// ---------------------------------------------------------------------- +$table_ser = new stdClass(); +$table_ser->width = '100%'; +$table_ser->class = 'filter-table-adv'; +$table_ser->size[0] = '50%'; +$table_ser->data = []; + +$table_ser->data[0][] = html_print_label_input_block( + __('Number of favorite services to show in the menu'), + "" +); + +// ---------------------------------------------------------------------- +// Reports +// ---------------------------------------------------------------------- +$interval_description = [ + 'large' => 'Long', + 'tiny' => 'Short', +]; + +$dirItems = scandir($config['homedir'].'/images/custom_logo'); +$customLogos = []; +foreach ($dirItems as $entryDir) { + if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) { + $customLogos['images/custom_logo/'.$entryDir] = $entryDir; + } +} + +if (empty($config['custom_report_front_logo'])) { + $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg'; +} + +// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. +if ($config['custom_report_front']) { + $firstpage_content = $config['custom_report_front_firstpage']; +} else { + $firstpage_content = io_safe_output($config['custom_report_front_firstpage']); +} + +$custom_report_front_firstpage = str_replace( + '(_URLIMAGE_)', + ui_get_full_url(false, true, false, false), + io_safe_output($firstpage_content) +); + +$table_report = new stdClass(); +$table_report->width = '100%'; +$table_report->class = 'filter-table-adv'; +$table_report->size[0] = '50%'; + +$table_report->data = []; + +$table_report->data[$row][] = html_print_label_input_block( + __('Show report info with description'), + html_print_checkbox_switch( + 'custom_report_info', + 1, + $config['custom_report_info'], + true + ) +); + +$table_report->data[$row][] = html_print_label_input_block( + __('Custom report front page'), + html_print_checkbox_switch( + 'custom_report_front', + 1, + $config['custom_report_front'], + true + ) +); +$row++; + +$table_report->data[$row][] = html_print_label_input_block( + __('PDF font size (px)'), + "" +); +$table_report->data[$row][] = html_print_label_input_block( + __('HTML font size for SLA (em)'), + "" +); +$row++; + +$table_report->data[$row][] = html_print_label_input_block( + __('Graph image height for HTML reports'), + html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true) +); +$table_report->data[$row][] = html_print_label_input_block( + __('Interval description'), + html_print_select( + $interval_description, + 'interval_description', + (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large', + '', + '', + '', + true, + false, + false + ) +); +$row++; + +// Logo. +$table_report->data['custom_report_front-logo'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( + __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), + true + ), + html_print_select( + $customLogos, + 'custom_report_front_logo', + io_safe_output($config['custom_report_front_logo']), + 'showPreview()', + __('Default'), + '', + true + ) +); +$table_report->data['custom_report_front-preview'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Preview'), + ''.html_print_image($config['custom_report_front_logo'], true).'' +); + +$table_report->colspan['custom_report_front-header'][] = 2; +$table_report->data['custom_report_front-header'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Header'), + html_print_textarea( + 'custom_report_front_header', + 5, + 15, + io_safe_output($config['custom_report_front_header']), + 'class="w90p height_300px"', + true + ) +); + +$table_report->colspan['custom_report_front-first_page'][] = 2; +$table_report->data['custom_report_front-first_page'][] = html_print_label_input_block( + __('Custom report front').' - '.__('First page'), + html_print_textarea( + 'custom_report_front_firstpage', + 15, + 15, + $custom_report_front_firstpage, + 'class="w90p height_300px"', + true + ) +); + +// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection. +$table_report->colspan['custom_report_front-footer'][] = 2; +$table_report->data['custom_report_front-footer'][] = html_print_label_input_block( + __('Custom report front').' - '.__('Footer'), + html_print_textarea( + 'custom_report_front_footer', + 5, + 15, + io_safe_output($config['custom_report_front_footer']), + 'class="w90p height_300px""', + true + ) +); + + +// ---------------------------------------------------------------------- +// OTHER CONFIGURATION +// ---------------------------------------------------------------------- +$decimal_separators = [ + ',' => ',', + '.' => '.', +]; + +$common_dividers = [ + ';' => ';', + ',' => ',', + '|' => '|', +]; + +$switchProminentTime = html_print_radio_button( + 'prominent_time', + 'comparation', + __('Comparation in rollover'), + ($config['prominent_time'] === 'comparation'), + true +); +$switchProminentTime .= html_print_radio_button( + 'prominent_time', + 'timestamp', + __('Timestamp in rollover'), + ($config['prominent_time'] === 'timestamp'), + true +); +$switchProminentTime .= html_print_radio_button( + 'prominent_time', + 'compact', + __('Compact mode'), + ($config['prominent_time'] === 'compact'), + true +); + +if ($config['csv_divider'] !== ';' && $config['csv_divider'] !== ',' && $config['csv_divider'] !== '|') { + $csvDividerInputs = html_print_input_text( + 'csv_divider', + $config['csv_divider'], + '', + 20, + 255, + true + ); + $csvDividerInputs .= ''.html_print_image( + 'images/logs@svg.svg', + true, + [ + 'id' => 'select', + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} else { + $csvDividerInputs = html_print_select( + $common_dividers, + 'csv_divider', + $config['csv_divider'], + '', + '', + '', + true, + false, + false + ); + $csvDividerInputs .= ''.html_print_image( + 'images/edit.svg', + true, + [ + 'id' => 'pencil', + 'class' => 'main_menu_icon invert_filter', + ] + ).''; +} + +$options_data_multiplier = []; +$options_data_multiplier[0] = __('Use 1024 when module unit are bytes'); +$options_data_multiplier[1] = __('Use always 1000'); +$options_data_multiplier[2] = __('Use always 1024'); + +$table_other = new stdClass(); +$table_other->width = '100%'; +$table_other->class = 'filter-table-adv'; +$table_other->size[0] = '50%'; +$table_other->size[1] = '50%'; +$table_other->data = []; + +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Networkmap max width'), + html_print_input_text( + 'networkmap_max_width', + $config['networkmap_max_width'], + '', + 10, + 20, + true + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Show only the group name'), + html_print_checkbox_switch( + 'show_group_name', + 1, + $config['show_group_name'], + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Show empty groups in group view'), + html_print_checkbox_switch( + 'show_empty_groups', + 1, + $config['show_empty_groups'], + true + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Date format string'), + html_print_input_text( + 'date_format', + $config['date_format'], + '', + 30, + 100, + true + ).ui_print_input_placeholder( + __('Example').': '.date($config['date_format']), + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Decimal separator'), + html_print_select( + $decimal_separators, + 'decimal_separator', + $config['decimal_separator'], + '', + '', + '', + true, + false, + false + ) +); + +$table_other->data[$row][] = html_print_label_input_block( + __('Visible time of successful notifiations'), + html_print_input_text( + 'notification_autoclose_time', + $config['notification_autoclose_time'], + '', + 10, + 10, + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Timestamp, time comparison, or compact mode'), + html_print_div( + [ + 'class' => 'switch_radio_button', + 'content' => $switchProminentTime, + ], + true + ) +); +$row++; +// ---------------------------------------------------------------------- +// CUSTOM VALUES POST PROCESS +// ---------------------------------------------------------------------- +$count_custom_postprocess = post_process_get_custom_values(); +$table_other->data[$row][] = html_print_label_input_block( + __('Custom values post process'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').': '.html_print_input_text('custom_value', '', '', 25, 50, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Text').': '.html_print_input_text('custom_text', '', '', 15, 50, true), + ], + true + ).html_print_button( + __('Add'), + 'custom_value_add_btn', + false, + '', + [ + 'icon' => 'next', + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'custom_value_add', + '', + true + ), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete custom values').html_print_select( + post_process_get_custom_values(), + 'custom_values', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'custom_values_del_btn', + empty($count_custom_postprocess), + '', + [ + 'icon' => 'delete', + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'custom_value_to_delete', + '', + true + ), + ], + true + ) +); + +// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// CUSTOM INTERVAL VALUES +// ---------------------------------------------------------------------- +$units = [ + 1 => __('seconds'), + SECONDS_1MINUTE => __('minutes'), + SECONDS_1HOUR => __('hours'), + SECONDS_1DAY => __('days'), + SECONDS_1MONTH => __('months'), + SECONDS_1YEAR => __('years'), +]; +$table_other->data[$row][] = html_print_label_input_block( + __('Interval values'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').html_print_input_text('interval_value', '', '', 5, 5, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'), + ], + true + ).html_print_button( + __('Add'), + 'interval_add_btn', + false, + '', + [ + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'interval_values', + $config['interval_values'], + true + ), + ], + true + ).html_print_div( + [ + 'class' => empty($config['interval_values']) === true ? 'invisible' : '', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete interval values').html_print_select( + get_periods( + false, + false + ), + 'intervals', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'interval_del_btn', + empty($config['interval_values']), + '', + [ + 'mode' => 'link', + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + ], + true + ).html_print_input_hidden( + 'interval_to_delete', + '', + true + ), + ], + true + ) +); +$row++; + + + +$table_other->data[$row][] = html_print_label_input_block( + __('Module units'), + html_print_div( + [ + 'class' => 'filter-table-adv-manual', + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Value').html_print_input_text('custom_module_unit', '', '', 15, 50, true), + ], + true + ).html_print_div( + [ + 'class' => '', + 'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'), + ], + true + ).html_print_button( + __('Add'), + 'module_unit_add_btn', + false, + '', + [ + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + 'mode' => 'link', + ], + true + ), + ], + true + ).html_print_div( + [ + 'class' => (empty($count_custom_postprocess) === true ? 'invisible' : ''), + 'content' => html_print_div( + [ + 'class' => '', + 'content' => __('Delete custom values').html_print_select( + get_custom_module_units(), + 'module_units', + '', + '', + '', + '', + true, + false, + true, + '', + false, + 'width: 100%' + ), + ], + true + ).html_print_button( + __('Delete'), + 'custom_module_unit_del_btn', + empty($count_custom_postprocess), + '', + [ + 'style' => 'display: flex; justify-content: flex-end; width: 100%;', + 'mode' => 'link', + ], + true + ).html_print_input_hidden( + 'custom_module_unit_to_delete', + '', + true + ), + ], + true + ) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('CSV divider'), + $csvDividerInputs +); + +$table_other->data[$row][] = html_print_label_input_block( + __('CSV decimal separator'), + html_print_select($decimal_separators, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false) +); +$row++; + +$table_other->data[$row][] = html_print_label_input_block( + __('Data multiplier to use in graphs/data'), + html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false) +); +$row++; + /* * * PAINT HTML. * */ -echo '
'; +echo '
'; echo ''.__('Behaviour configuration').' '.ui_print_help_icon('behavoir_conf_tab', true).''; html_print_table($table_behaviour); echo '
'; -echo '
'; +echo '
'; echo ''.__('GIS configuration').' '.ui_print_help_icon('gis_conf_tab', true).''; html_print_table($table_gis); echo '
'; -echo '
'; +echo '
'; echo ''.__('Style configuration').' '.ui_print_help_icon('style_conf_tab', true).''; html_print_table($table_styles); echo '
'; -echo '
'; +echo '
'; echo ''.__('Charts configuration').' '.ui_print_help_icon('charts_conf_tab', true).''; html_print_table($table_chars); echo '
'; -echo '
'; +echo '
'; echo ''.__('Font and Text configuration').' '.ui_print_help_icon('front_and_text_conf_tab', true).''; html_print_table($table_font); echo '
'; -echo '
'; +echo '
'; echo ''.__('Visual consoles configuration').' '.ui_print_help_icon('visual_consoles_conf_tab', true).''; html_print_table($table_vc); echo '
'; -echo '
'; +echo '
'; echo ''.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).''; html_print_table($table_report); echo '
'; -echo '
'; +echo '
'; echo ''.__('Services configuration').' '.ui_print_help_icon('services_conf_tab', true).''; html_print_table($table_ser); echo '
'; -echo '
'; +echo '
'; echo ''.__('Other configuration').' '.ui_print_help_icon('other_conf_tab', true).''; html_print_table($table_other); echo '
'; -html_print_div( - [ - 'class' => 'action-buttons w100p', - 'content' => html_print_submit_button( - __('Update'), - 'update_button', - false, - [ 'icon' => 'next' ], - true - ), - ] +html_print_action_buttons( + html_print_submit_button( + __('Update'), + 'update_button', + false, + [ 'icon' => 'next' ], + true + ) ); echo ''; @@ -1871,22 +2171,23 @@ $(document).ready (function () { $("select#vc_default_cache_expiration_select").closest("tr").show(); } }).change(); - + var comfort = 0; - +/* if(comfort == 0){ $(':input,:radio,:checkbox,:file').change(function(){ - $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); + $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); var comfort = 1; }); $("*").keydown(function(){ - $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); + $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'}); var comfort = 1; }); $('#form_setup').after('
'); - } + } + $("#form_setup #text-graph_color1").attachColorPicker(); $("#form_setup #text-graph_color2").attachColorPicker(); @@ -1897,8 +2198,10 @@ $(document).ready (function () { $("#form_setup #text-graph_color7").attachColorPicker(); $("#form_setup #text-graph_color8").attachColorPicker(); $("#form_setup #text-graph_color9").attachColorPicker(); + + */ $("#form_setup #text-graph_color10").attachColorPicker(); - + //------------------------------------------------------------------ // CUSTOM VALUES POST PROCESS @@ -1931,7 +2234,7 @@ $(document).ready (function () { }); $("#button-interval_add_btn").click( function() { - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); //------------------------------------------------------------------ @@ -1941,11 +2244,11 @@ $(document).ready (function () { $("#button-custom_module_unit_del_btn").click( function() { var unit_selected = $('#module_units option:selected').val(); $('#hidden-custom_module_unit_to_delete').val(unit_selected); - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); $("#button-module_unit_add_btn").click( function() { - $('#submit-update_button').trigger('click'); + $('#button-update_button').trigger('click'); }); //------------------------------------------------------------------ @@ -1982,7 +2285,7 @@ $(".logo_preview").click (function(e) { var homeUrl = ""; var homeUrlEnt = homeUrl + ""; - var elementToCheck = $('#'+e.target.id).parent().attr('id'); + var elementToCheck = e.target.id; // Fill it seing the target has been clicked switch (elementToCheck) { case 'button-custom_logo_preview': @@ -2040,6 +2343,7 @@ $(".logo_preview").click (function(e) { }); $("#button-gis_icon_preview").click (function (e) { + var homeUrl = ""; var icon_prefix = $("select#gis_default_icon option:selected").val(); var icon_path = homeUrl + "images/gis_map/icons/" + icon_prefix; diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index bb1c5d1c73..06d06c9823 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1,5 +1,4 @@ 'user_form_title', - 'content' => ((bool) $id === true) ? sprintf('%s [ %s ]', __('Update User'), $id) : __('Create User'), - ] - ); -} - if (!$new_user) { $user_id = '

'.__('User ID').':

'; $user_id .= ''.$id.''; $user_id .= html_print_input_hidden('id_user', $id, true); $user_id .= '
'; - $apiTokenContentElements[] = ''.__('API Token').''; + $apiTokenContentElements[] = ''.__('API Token').''; $apiTokenContentElements[] = html_print_button( __('Renew'), 'renew_api_token', false, sprintf( - 'javascript:renewAPIToken(\'%s\', \'%s\', \'%s\')', + 'javascript:renewAPIToken("%s", "%s", "%s")', __('Warning'), __('The API token will be renewed. After this action, the last token you were using will not work. Are you sure?'), 'user_profile_form', @@ -1033,7 +1023,7 @@ if (!$new_user) { 'show_api_token', false, sprintf( - 'javascript:showAPIToken(\'%s\', \'%s\')', + 'javascript:showAPIToken("%s", "%s")', __('API Token'), base64_encode(__('Your API Token is:').' 
'.users_get_API_token($id).'
 '.__('Please, avoid share this string with others.')), ), @@ -1282,8 +1272,9 @@ if (is_metaconsole() === false) { if (is_metaconsole() === true) { $array_filters = get_filters_custom_fields_view(0, true); - $search_custom_fields_view = '

'.__('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true).'

'; - $search_custom_fields_view .= html_print_select( + $searchCustomFieldView = []; + $searchCustomFieldView[] = __('Search custom field view'); + $searchCustomFieldView[] = html_print_select( $array_filters, 'default_custom_view', $user_info['default_custom_view'], @@ -1295,7 +1286,10 @@ if (is_metaconsole() === true) { true, '', false - ).'
'; + ).ui_print_input_placeholder( + __('Load by default the selected view in custom field view'), + true + ); } $values = [ @@ -1377,6 +1371,8 @@ $home_screen .= html_print_input_text( false ); +$home_screen = ''; + $size_pagination = '

'.__('Block size for pagination').'

'; $size_pagination .= html_print_input_text( 'block_size', @@ -1395,19 +1391,20 @@ if ($id === $config['id_user']) { ); } -if (enterprise_installed() && is_metaconsole() === true) { +if (enterprise_installed() === true && is_metaconsole() === true) { $user_info_metaconsole_access = 'only_console'; if (isset($user_info['metaconsole_access'])) { $user_info_metaconsole_access = $user_info['metaconsole_access']; } - // TODO review help tips on meta. - $meta_access = '

'.__('Metaconsole access').' './* ui_print_help_icon('meta_access', true). */ '

'; $metaconsole_accesses = [ 'basic' => __('Basic'), 'advanced' => __('Advanced'), ]; - $meta_access .= html_print_select( + + $outputMetaAccess = []; + $outputMetaAccess[] = __('Metaconsole access'); + $outputMetaAccess[] = html_print_select( $metaconsole_accesses, 'metaconsole_access', $user_info_metaconsole_access, @@ -1417,51 +1414,9 @@ if (enterprise_installed() && is_metaconsole() === true) { true, false, false - ).'
'; + ); } -/* - $not_login = '

'.__('Not Login').'

'; - $not_login .= ui_print_help_tip( - __('The user with not login set only can access to API.'), - true - ); - $not_login .= html_print_checkbox_switch( - 'not_login', - 1, - $user_info['not_login'], - true - ).'
'; - - $local_user = '

'.__('Local user').'

'; - $local_user .= ui_print_help_tip( - __('The user with local authentication enabled will always use local authentication.'), - true - ); - $local_user .= html_print_checkbox_switch( - 'local_user', - 1, - $user_info['local_user'], - true - ).'
'; - - $session_time = '

'.__('Session Time'); - $session_time .= ui_print_help_tip( - __('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), - true - ).'

'; - $session_time .= html_print_input_text( - 'session_time', - $user_info['session_time'], - '', - 5, - 5, - true.false, - false, - '', - 'class="input_line_small"' - ).'
'; -*/ $user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group)))); if (empty($user_groups) === false) { @@ -1582,31 +1537,6 @@ if (empty($doubleAuthElementsContent) === false) { $doubleAuthentication = ''; } - -/* - if (isset($double_authentication)) { - $double_authentication .= '
'; -}*/ - - - - - - - - - - - - - - - - - - - - $autorefresh_list_out = []; if (is_metaconsole() === false || is_centralized() === true) { $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail'; @@ -1665,31 +1595,32 @@ if (isset($autorefresh_list) === false) { } } - - if (is_metaconsole() === true) { enterprise_include_once('include/functions_metaconsole.php'); $access_node = db_get_value('metaconsole_access_node', 'tusuario', 'id_user', $id); - $metaconsole_agents_manager = '

'.__('Enable agents managment').'

'; - $metaconsole_agents_manager .= html_print_checkbox_switch( + $metaconsoleAgentManager = []; + $metaconsoleAgentManager[] = __('Enable agents managment'); + $metaconsoleAgentManager[] = html_print_checkbox_switch( 'metaconsole_agents_manager', 1, $user_info['metaconsole_agents_manager'], true - ).'
'; + ); - $metaconsole_access_node = '

'.__('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true).'

'; - $metaconsole_access_node .= html_print_checkbox( + $metaconsoleAgentManager[] = __('Enable node access').ui_print_help_tip( + __('With this option enabled, the user will can access to nodes console'), + true + ); + $metaconsoleAgentManager[] = html_print_checkbox_switch( 'metaconsole_access_node', 1, $access_node, true - ).'
'; + ); } - echo '
'; echo '
'; @@ -1701,137 +1632,8 @@ if (!$id) { $user_id_create = $user_id; } -if (is_metaconsole() === true) { - $access_or_pagination = $meta_access; - if ($id != '' && !$is_err) { - $div_user_info = ' - '; - } else { - $div_user_info = ' - '; - } - - echo '
-
- -

Extra info

'.$email.$phone.$not_login.$local_user.$session_time.'
-
-
-
'.$language.$access_or_pagination.$skin.$default_event_filter.$double_authentication.'
- -
'.$timezone; - - echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_access_node; - - $autorefresh_show = '

'._('Autorefresh').ui_print_help_tip( - __('This will activate autorefresh in selected pages'), - true - ).'

'; - $select_out = html_print_select( - $autorefresh_list_out, - 'autorefresh_list_out[]', - '', - '', - '', - '', - true, - true, - true, - '', - false, - 'width:100%' - ); - $arrows = ' '; - $select_in = html_print_select( - $autorefresh_list, - 'autorefresh_list[]', - '', - '', - '', - '', - true, - true, - true, - '', - false, - 'width:100%' - ); - - $table_ichanges = '
-
-

'.__('Full list of pages').':

-
'.$select_out.'
-
-
- '.html_print_image( - 'images/darrowright_green.png', - true, - [ - 'id' => 'right_autorefreshlist', - 'alt' => __('Push selected pages into autorefresh list'), - 'title' => __('Push selected pages into autorefresh list'), - ] - ).' - '.html_print_image( - 'images/darrowleft_green.png', - true, - [ - 'id' => 'left_autorefreshlist', - 'alt' => __('Pop selected pages out of autorefresh list'), - 'title' => __('Pop selected pages out of autorefresh list'), - ] - ).' -
-
-

'.__('List of pages with autorefresh').':

-
'.$select_in.'
-
-
'; - - $autorefresh_show .= $table_ichanges; - - // Time autorefresh. - $times = get_refresh_time_array(); - $time_autorefresh = '

'.__('Time autorefresh'); - $time_autorefresh .= ui_print_help_tip( - __('Interval of autorefresh of the elements, by default they are 30 seconds, needing to enable the autorefresh first'), - true - ).'

'; - $time_autorefresh .= html_print_select( - $times, - 'time_autorefresh', - $user_info['time_autorefresh'], - '', - '', - '', - true, - false, - false - ).'
'; - - - echo '
-
-
'.$autorefresh_show.$time_autorefresh.'
-
-
'.$comments.'
-
'; - - if (empty($ehorus) === false) { - html_print_div( - [ - 'class' => 'user_edit_third_row white_box', - 'content' => $ehorus, - ], - true - ); - } -} else { - $access_or_pagination = $size_pagination; - // WIP: Only for node. - include_once 'user_management.php'; -} - +// User management form. +require_once 'user_management.php'; if ((bool) $config['admin_can_add_user'] === true) { html_print_csrf_hidden(); @@ -1912,7 +1714,7 @@ if (is_metaconsole() === false) { $(document).ready(function() { // Set up the picker to update target timezone and country select lists. $('#timezone-image').timezonePicker({ - target: '#timezone', + target: '#timezone1', }); // Optionally an auto-detect button to trigger JavaScript geolocation. @@ -1934,23 +1736,13 @@ if (is_metaconsole() === false) { var json_profile = $('#hidden-json_profile'); /* ) { id_imodule = $(value).attr('value'); - $("select[name='autorefresh_list[]']").append($("").val(id_imodule).html('' + imodule_name + '')); + $("select[name='autorefresh_list[]'] option").each(function() { $(this).attr("selected", true) }); + $("select[name='autorefresh_list[]']").append($("").val(id_imodule).html('' + imodule_name + '').attr("selected", true)); $("#autorefresh_list_out").find("option[value='" + id_imodule + "']").remove(); $("#autorefresh_list").find("option[value='']").remove(); $("#autorefresh_list").find("option[value='0']").remove(); diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index e4fe4225fa..57ddd56d50 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -395,8 +395,6 @@ if ($delete_user === true) { __('There was a problem deleting the user from %s', io_safe_input($server['server_name'])) ); } - - header('Refresh:1'); } } else { ui_print_error_message(__('There was a problem deleting the user')); @@ -463,43 +461,72 @@ if (($filter_group == 0) && ($filter_search == '')) { $filterTable = new stdClass(); $filterTable->width = '100%'; -$filterTable->class = 'fixed_filter_bar'; +$filterTable->class = 'filter-table-adv'; $filterTable->rowclass[0] = ''; $filterTable->cellstyle[0][0] = 'width:0'; $filterTable->cellstyle[0][1] = 'width:0'; -$filterTable->data[0][0] = __('Group'); -$filterTable->data[1][0] = html_print_select_groups( - false, - 'AR', - true, - 'filter_group', - $filter_group, - '', - '', - 0, - true +$filterTable->data[0][] = html_print_label_input_block( + __('Group'), + html_print_select_groups( + false, + 'AR', + true, + 'filter_group', + $filter_group, + '', + '', + 0, + true + ) ); -$filterTable->data[0][1] = __('Search').ui_print_help_tip(__('Search by username, fullname or email'), true); -$filterTable->data[1][1] = html_print_input_text( - 'filter_search', - $filter_search, - __('Search by username, fullname or email'), - 30, - 90, - true -); -$filterTable->cellstyle[1][2] = 'vertical-align: bottom'; -$filterTable->data[1][2] = html_print_submit_button( + +$filterTable->data[0][] = html_print_label_input_block( __('Search'), - 'search', - false, + html_print_input_text( + 'filter_search', + $filter_search, + __('Search by username, fullname or email'), + 30, + 90, + true + ).ui_print_input_placeholder( + __('Search by username, fullname or email'), + true + ) +); + +$form_filter = ""; +$form_filter .= html_print_table($filterTable, true); +$form_filter .= html_print_div( [ - 'icon' => 'search', - 'class' => 'float-right', - 'mode' => 'secondary mini', + 'class' => 'action-buttons-right-forced', + 'content' => html_print_submit_button( + __('Search'), + 'search', + false, + [ + 'icon' => 'search', + 'class' => 'float-right', + 'mode' => 'secondary mini', + ], + true + ), ], true ); +$form_filter .= ''; + +ui_toggle( + $form_filter, + ''.__('Filter').'', + __('Filter'), + 'filter', + true, + false, + '', + 'white-box-content no_border', + 'filter-datatable-main box-flat white_table_graph fixed_filter_bar' +); $is_management_allowed = true; if (is_metaconsole() === false && is_management_allowed() === false) { @@ -520,20 +547,6 @@ if (is_metaconsole() === false && is_management_allowed() === false) { ); } - -if (is_metaconsole() === true) { - $filterTable->width = '96%'; - $form_filter = "
"; - $form_filter .= html_print_table($filterTable, true); - $form_filter .= '
'; - ui_toggle($form_filter, __('Show Options')); -} else { - $form_filter = "
"; - $form_filter .= html_print_table($filterTable, true); - $form_filter .= '
'; - echo $form_filter; -} - // Urls to sort the table. $url_up_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=up&pure='.$pure; $url_down_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=down&pure='.$pure; diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index cff87aef6f..9bd2d6a858 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -325,53 +325,55 @@ if ($new_user === false) { $userManagementTable->data['passwordManage_table'] = html_print_table($passwordManageTable, true); +if (users_is_admin() === true) { + $userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p'; + $userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap'; + $userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap'; + $notLoginCheckContent = []; + $notLoginCheckContent[] = ''.__('Not Login').''; + $notLoginCheckContent[] = html_print_checkbox_switch( + 'not_login', + 1, + $user_info['not_login'], + true + ); -$userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p'; -$userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap'; -$userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap'; -$notLoginCheckContent = []; -$notLoginCheckContent[] = ''.__('Not Login').''; -$notLoginCheckContent[] = html_print_checkbox_switch( - 'not_login', - 1, - $user_info['not_login'], - true -); + $userManagementTable->data['captions_loginErrorUser'][0] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $notLoginCheckContent), + ], + true + ); + $userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder( + __('The user with not login set only can access to API.'), + true + ); -$userManagementTable->data['captions_loginErrorUser'][0] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $notLoginCheckContent), - ], - true -); -$userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder( - __('The user with not login set only can access to API.'), - true -); + $localUserCheckContent = []; + $localUserCheckContent[] = ''.__('Local User').''; + $localUserCheckContent[] = html_print_checkbox_switch( + 'local_user', + 1, + $user_info['local_user'], + true + ); -$localUserCheckContent = []; -$localUserCheckContent[] = ''.__('Local User').''; -$localUserCheckContent[] = html_print_checkbox_switch( - 'local_user', - 1, - $user_info['local_user'], - true -); + $userManagementTable->data['captions_loginErrorUser'][1] = html_print_div( + [ + 'class' => 'margin-top-10', + 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', + 'content' => implode('', $localUserCheckContent), + ], + true + ); + $userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder( + __('The user with local authentication enabled will always use local authentication.'), + true + ); +} -$userManagementTable->data['captions_loginErrorUser'][1] = html_print_div( - [ - 'class' => 'margin-top-10', - 'style' => 'display: flex; flex-direction: row-reverse; align-items: center;', - 'content' => implode('', $localUserCheckContent), - ], - true -); -$userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder( - __('The user with local authentication enabled will always use local authentication.'), - true -); $userManagementTable->data['show_tips_startup'][0] = html_print_checkbox_switch('show_tips_startup', 1, ($user_info['show_tips_startup'] === null) ? true : $user_info['show_tips_startup'], true); $userManagementTable->data['show_tips_startup'][1] = ''.__('Show usage tips at startup').''; @@ -551,10 +553,10 @@ $userManagementTable->data['fields_autorefreshTime'][0] .= ui_print_input_placeh // Title for Language and Appearance. $userManagementTable->data['title_lookAndFeel'] = html_print_subtitle_table(__('Language and Appearance')); // Language and color scheme. -$userManagementTable->rowclass['captions_lang_colorscheme'] = 'field_half_width'; -$userManagementTable->rowclass['fields_lang_colorscheme'] = 'field_half_width'; -$userManagementTable->data['captions_lang_colorscheme'][0] = __('Language'); -$userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_from_sql( +$userManagementTable->rowclass['line1_looknfeel'] = 'field_half_width'; +$userManagementTable->rowclass['line2_looknfeel'] = 'field_half_width'; +$userManagementTable->data['line1_looknfeel'][0] = __('Language'); +$userManagementTable->data['line2_looknfeel'][0] = html_print_select_from_sql( 'SELECT id_language, name FROM tlanguage', 'language', $user_info['language'], @@ -564,8 +566,15 @@ $userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_fro true ); -$userManagementTable->data['captions_lang_colorscheme'][1] = __('User color scheme'); -$userManagementTable->data['fields_lang_colorscheme'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); +if (is_metaconsole() === true) { + if (users_is_admin() === true) { + $userManagementTable->data['line1_looknfeel'][1] = $outputMetaAccess[0]; + $userManagementTable->data['line2_looknfeel'][1] = $outputMetaAccess[1]; + } +} else { + $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme'); + $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); +} $userManagementTable->rowclass['captions_blocksize_eventfilter'] = 'field_half_width'; $userManagementTable->rowclass['fields_blocksize_eventfilter'] = 'field_half_width'; @@ -591,41 +600,55 @@ $userManagementTable->data['fields_blocksize_eventfilter'][1] = html_print_selec false, false ); +if (is_metaconsole() === false) { + // Home screen table. + $homeScreenTable = new stdClass(); + $homeScreenTable->class = 'w100p table_section full_section'; + $homeScreenTable->id = 'home_screen_table'; + $homeScreenTable->style = []; + $homeScreenTable->rowclass = []; + $homeScreenTable->data = []; + // Home screen. + $homeScreenTable->data['captions_homescreen'][0] = __('Home screen'); + $homeScreenTable->colspan['captions_homescreen'][0] = 2; + $homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width'; + $homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex'; + $homeScreenTable->data['fields_homescreen'][0] = html_print_select( + $homeScreenValues, + 'section', + io_safe_output($user_info['section']), + 'show_data_section();', + '', + -1, + true, + false, + false + ); + $homeScreenTable->data['fields_homescreen'][1] = html_print_div( + [ + 'class' => 'w100p', + 'content' => $customHomeScreenDataField, + ], + true + ); -// Home screen table. -$homeScreenTable = new stdClass(); -$homeScreenTable->class = 'w100p table_section full_section'; -$homeScreenTable->id = 'home_screen_table'; -$homeScreenTable->style = []; -$homeScreenTable->rowclass = []; -$homeScreenTable->data = []; + $userManagementTable->rowclass['homescreen_table'] = 'w100p'; + $userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true); +} -// Home screen. -$homeScreenTable->data['captions_homescreen'][0] = __('Home screen'); -$homeScreenTable->colspan['captions_homescreen'][0] = 2; -$homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width'; -$homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex'; -$homeScreenTable->data['fields_homescreen'][0] = html_print_select( - $homeScreenValues, - 'section', - io_safe_output($user_info['section']), - 'show_data_section();', - '', - -1, - true, - false, - false -); -$homeScreenTable->data['fields_homescreen'][1] = html_print_div( - [ - 'class' => 'w100p', - 'content' => $customHomeScreenDataField, - ], - true -); +if (is_metaconsole() === true && users_is_admin() === true) { + $userManagementTable->rowclass['search_custom1_looknfeel'] = 'field_half_width'; + $userManagementTable->rowclass['search_custom2_looknfeel'] = 'field_half_width flex-column'; + $userManagementTable->data['search_custom1_looknfeel'][0] = $searchCustomFieldView[0]; + $userManagementTable->data['search_custom2_looknfeel'][0] = $searchCustomFieldView[1]; -$userManagementTable->rowclass['homescreen_table'] = 'w100p'; -$userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true); + $userManagementTable->rowclass['agent_manager1_looknfeel'] = 'field_half_width'; + $userManagementTable->rowclass['agent_manager2_looknfeel'] = 'field_half_width flex-column'; + $userManagementTable->data['agent_manager1_looknfeel'][0] = $metaconsoleAgentManager[0]; + $userManagementTable->data['agent_manager1_looknfeel'][1] = $metaconsoleAgentManager[2]; + $userManagementTable->data['agent_manager2_looknfeel'][0] = $metaconsoleAgentManager[1]; + $userManagementTable->data['agent_manager2_looknfeel'][1] = $metaconsoleAgentManager[3]; +} // Timezone. $userManagementTable->rowclass['captions_timezone'] = 'field_half_width'; @@ -639,14 +662,15 @@ $userManagementTable->data['fields_timezone'][0] .= ui_print_input_placeholder( __('The timezone must be that of the associated server.'), true ); - -$userManagementTable->data['fields_timezone'][1] = html_print_div( - [ - 'id' => 'timezone-picker', - 'content' => implode('', $timezoneContent), - ], - true -); +if (is_metaconsole() === false) { + $userManagementTable->data['fields_timezone'][1] = html_print_div( + [ + 'id' => 'timezone-picker', + 'content' => implode('', $timezoneContent), + ], + true + ); +} // Title for Language and Appearance. $userManagementTable->data['title_additionalSettings'] = html_print_subtitle_table(__('Additional settings')); @@ -743,3 +767,19 @@ html_print_table($userManagementTable); if ($new_user === false && ((bool) check_acl($config['id_user'], 0, 'UM') === true)) { profile_print_profile_table($id, io_safe_output($json_profile), false, ($is_err === true)); } + +?> + \ No newline at end of file diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 781ec7e536..1c3642b075 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -731,7 +731,7 @@ class DiscoveryTaskList extends HTML case DISCOVERY_CLOUD_AZURE_COMPUTE: // Discovery Applications MySQL. $data[6] = html_print_image( - 'images/plugin@svg.svg', + 'images/plugins@svg.svg', true, [ 'title' => __('Discovery Cloud Azure Compute'), @@ -744,7 +744,7 @@ class DiscoveryTaskList extends HTML case DISCOVERY_CLOUD_AWS_EC2: // Discovery Applications MySQL. $data[6] = html_print_image( - 'images/plugin@svg.svg', + 'images/plugins@svg.svg', true, [ 'title' => __('Discovery Cloud AWS EC2'), @@ -856,7 +856,7 @@ class DiscoveryTaskList extends HTML } else { // APP or external script recon task. $data[6] = html_print_image( - 'images/plugin@svg.svg', + 'images/plugins@svg.svg', true, ['class' => 'main_menu_icon invert_filter'] ).'  '; @@ -873,7 +873,7 @@ class DiscoveryTaskList extends HTML '100%', 1.9, // Color. - '#82b92e', + '#ececec', // Return. true, // Text. @@ -1218,12 +1218,12 @@ class DiscoveryTaskList extends HTML $result .= progress_circular_bar( $task['id_rt'], ($task['status'] < 0) ? 100 : $task['status'], - 200, - 200, - '#7eb641', + 150, + 150, + '#3A3A3A', '%', '', - '#3A3A3A', + '#ececec', 0 ); @@ -1288,12 +1288,12 @@ class DiscoveryTaskList extends HTML $result .= progress_circular_bar( $task['id_rt'].'_detail', $task['stats']['c_network_percent'], - 200, - 200, - '#7eb641', + 150, + 150, + '#3A3A3A', '%', '', - '#3A3A3A', + '#ececec', 0 ); $result .= '
'; diff --git a/pandora_console/images/menu/fav_menu_gray.svg b/pandora_console/images/menu/fav_menu_gray.svg new file mode 100644 index 0000000000..8a894d7948 --- /dev/null +++ b/pandora_console/images/menu/fav_menu_gray.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / star@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/plus@svg.svg b/pandora_console/images/plus@svg.svg new file mode 100644 index 0000000000..bb528c8ad7 --- /dev/null +++ b/pandora_console/images/plus@svg.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/pandora_console/images/star_fav_menu.png b/pandora_console/images/star_fav_menu.png new file mode 100644 index 0000000000..5d1521f202 Binary files /dev/null and b/pandora_console/images/star_fav_menu.png differ diff --git a/pandora_console/images/world@svg.svg b/pandora_console/images/world@svg.svg new file mode 100644 index 0000000000..c71297eda4 --- /dev/null +++ b/pandora_console/images/world@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / web@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/include/ajax/fav_menu.ajax.php b/pandora_console/include/ajax/fav_menu.ajax.php new file mode 100644 index 0000000000..0b837ec9b3 --- /dev/null +++ b/pandora_console/include/ajax/fav_menu.ajax.php @@ -0,0 +1,82 @@ + $url, + 'id_user' => $config['id_user'], + ], + ['*'] +); +$res = false; +$action = ''; +if ($exist !== false) { + $res = db_process_sql_delete( + 'tfavmenu_user', + [ + 'url' => $url, + 'id_user' => $config['id_user'], + ] + ); + $action = 'delete'; +} else { + $res = db_process_sql_insert( + 'tfavmenu_user', + [ + 'id_element' => $id_element, + 'url' => $url, + 'label' => $label, + 'section' => $section, + 'id_user' => $id_user, + ] + ); + $action = 'create'; +} + +if ($res !== false) { + echo json_encode(['success' => true, 'action' => $action]); +} else { + echo json_encode(['success' => false, 'action' => $action]); +} diff --git a/pandora_console/include/ajax/map_enterprise.ajax.php b/pandora_console/include/ajax/map_enterprise.ajax.php index a0178457f5..4c5738f29a 100644 --- a/pandora_console/include/ajax/map_enterprise.ajax.php +++ b/pandora_console/include/ajax/map_enterprise.ajax.php @@ -25,6 +25,8 @@ if ((bool) is_metaconsole() === true) { if ($networkmap) { $networkmap_id = get_parameter('networkmap_id', 0); + $dashboard = get_parameter('dashboard', 0); + $size = get_parameter('size', []); $x_offset = get_parameter('x_offset', 0); $y_offset = get_parameter('y_offset', 0); $zoom_dash = get_parameter('zoom_dash', 0.5); @@ -62,6 +64,15 @@ if ($networkmap) { global $id_networkmap; $id_networkmap = $networkmap['id']; $tab = 'radial_dynamic'; + if (empty($size) === false) { + if ($size['width'] > $size['height']) { + $width = $size['height']; + $height = ($size['height'] - 10); + } else { + $width = $size['width']; + $height = ($size['width'] + 50); + } + } include_once 'operation/agentes/networkmap.dinamic.php'; } else { diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index bd356894ad..30b84be44f 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1573,7 +1573,7 @@ if (check_login()) { $value['thresholds'] ); - $resultData = ''; + $resultData = ''; if ($vdata !== null && $vdata !== '' && $vdata !== false) { if (isset($formatData) === true && (bool) $formatData === true @@ -1750,7 +1750,9 @@ if (check_login()) { INNER JOIN tagente ON tagente_modulo.id_agente = tagente.id_agente INNER JOIN tagente_estado - ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo' + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where ); $recordsTotal = db_get_value_sql($sql_count); @@ -1795,6 +1797,32 @@ if (check_login()) { } } + if (in_array(0, $servers_ids) === true) { + $sql = sprintf( + 'SELECT + tagente_modulo.nombre, + tagente.alias, + tagente.id_agente, + tagente_estado.last_status_change, + tagente_estado.estado + FROM tagente_modulo + INNER JOIN tagente + ON tagente_modulo.id_agente = tagente.id_agente + INNER JOIN tagente_estado + ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + WHERE %s', + $where + ); + + $res_sql = db_get_all_rows_sql($sql); + + foreach ($res_sql as $row_sql) { + $row_sql['server_name'] = __('Metaconsole'); + $row_sql['server_url'] = $config['homeurl']; + array_push($data, $row_sql); + } + } + // Drop temporary table if exist. db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;'); @@ -1852,7 +1880,9 @@ if (check_login()) { $sql_count = sprintf( 'SELECT COUNT(*) AS "total" - FROM temp_modules_status' + FROM temp_modules_status + WHERE %s', + $where ); $recordsTotal = db_get_value_sql($sql_count); @@ -2044,6 +2074,14 @@ if (check_login()) { if ($monitor_filters === false) { echo 'error'; } else { + db_process_sql_delete( + 'tfavmenu_user', + [ + 'id_element' => $id, + 'section' => 'Modules', + 'id_user' => $config['id_user'], + ] + ); echo 'ok'; } } diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 7bc4785011..2e9ec50479 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -27,8 +27,6 @@ */ // Begin. -require_once 'config.php'; - require_once __DIR__.'/config.php'; require_once __DIR__.'/functions.php'; require_once __DIR__.'/functions_db.php'; @@ -87,7 +85,7 @@ if (check_login(false) === false) {

Access is not granted

-