From 1feebae56497953b994017ab4684ce7ec610e8a7 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 22 Feb 2019 13:33:46 +0100 Subject: [PATCH] removed fullurl supervisor Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a --- .../include/class/ConsoleSupervisor.php | 118 +++++------------- 1 file changed, 33 insertions(+), 85 deletions(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 4873186d62..c0a91480cc 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -637,9 +637,7 @@ class ConsoleSupervisor 'Your license is going to expire in %d days. Please contact sales.', $days_to_expiry ), - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/setup/license' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/license', ] ); } else if ($days_to_expiry < 0) { @@ -649,9 +647,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.LICENSE.EXPIRATION', 'title' => __('License is expired.'), 'message' => __('Your license has expired. Please contact sales.'), - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/setup/license' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/license', ] ); return false; @@ -728,9 +724,7 @@ class ConsoleSupervisor 'Directory %s is not writable. Please configure proper permissions.', $config['attachment_store'] ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', ] ); return; @@ -752,9 +746,7 @@ class ConsoleSupervisor 'There are more than %d files in attachment, you should consider cleaning up your attachment directory manually.', $config['num_files_attachment'] ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); } else { @@ -786,9 +778,7 @@ class ConsoleSupervisor 'Remote configuration directory %s is not readable. Please configure it.', $config['remote_config'] ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', ] ); return; @@ -807,9 +797,7 @@ class ConsoleSupervisor 'Remote configuration directory %s is not writable. Please configure it.', $config['remote_config'].'/conf' ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', ] ); } else { @@ -827,9 +815,7 @@ class ConsoleSupervisor 'Collections directory %s is not writable. Please configure it.', $config['remote_config'].'/collections' ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', ] ); } else { @@ -847,9 +833,7 @@ class ConsoleSupervisor 'MD5 directory %s is not writable. Please configure it.', $config['remote_config'].'/md5' ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', ] ); } else { @@ -880,9 +864,7 @@ class ConsoleSupervisor $MAX_FILES_DATA_IN, $config['remote_config'] ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); } else { @@ -905,9 +887,7 @@ class ConsoleSupervisor $MAX_BADXML_FILES_DATA_IN, $config['remote_config'] ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); } else { @@ -984,9 +964,7 @@ class ConsoleSupervisor $modules_queued, $queue['queued_modules'] ), - 'url' => ui_get_full_url( - 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60' - ), + 'url' => 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60', ] ); } else { @@ -1088,9 +1066,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.SERVER.STATUS.'.$server['id_server'], 'title' => $msg, 'message' => $description, - 'url' => ui_get_full_url( - 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60' - ), + 'url' => 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60', ] ); } @@ -1176,7 +1152,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.PHP.SAFE_MODE', 'title' => __('PHP safe mode is enabled. Some features may not properly work.'), 'message' => __('To disable, change it on your PHP configuration file (php.ini) and put safe_mode = Off (Dont forget restart apache process after changes)'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1195,7 +1171,7 @@ class ConsoleSupervisor __('Recommended value is %s'), '-1 ('.__('Unlimited').')' ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1214,7 +1190,7 @@ class ConsoleSupervisor __('Recommended value is: %s'), '0 ('.__('Unlimited').')' ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1233,7 +1209,7 @@ class ConsoleSupervisor __('Recommended value is: %s'), sprintf(__('%s or greater'), '800M') ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1252,7 +1228,7 @@ class ConsoleSupervisor __('Recommended value is: %s'), sprintf(__('%s or greater'), '500M') ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1265,7 +1241,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.PHP.DISABLE_FUNCTIONS', 'title' => __('Problems with disable functions in PHP.INI'), 'message' => __('Variable disable_functions containts functions system() or exec(), in PHP configuration file (php.ini)').'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1343,9 +1319,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.HISTORYDB', 'title' => __('Historical database not available'), 'message' => __('Historical database is enabled. But not available using given configuration. Please check it.'), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db', ] ); } else { @@ -1392,9 +1366,7 @@ class ConsoleSupervisor 'Your database is not maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.', io_safe_output(get_product_name()) ), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); } else { @@ -1454,9 +1426,7 @@ class ConsoleSupervisor 'Historical database maintance problem.' ), 'message' => __('Your historical database is not being maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.', get_product_name()), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); } else { @@ -1495,9 +1465,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.HISTORYDB.MR', 'title' => __('Historical database MR missmatch'), 'message' => __('Your historical database is not using the same schema of main DB. This could produce anomalyes while storing historical data.'), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db', ] ); } else { @@ -1539,9 +1507,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.EXT.ELASTICSEARCH', 'title' => __('Log collector cannot connect to ElasticSearch'), 'message' => __('ElasticSearch is not available using current configuration. Please check it.'), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=log' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=log', ] ); } else { @@ -1611,9 +1577,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.METACONSOLE.DB_CONNECTION', 'title' => __('Metaconsole DB is not available.'), 'message' => __('Cannot connect with Metaconsole DB using stored configuration. Please check it.'), - 'url' => ui_get_full_url( - 'index.php?sec=general&sec2=godmode/setup/setup§ion=enterprise' - ), + 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=enterprise', ] ); } @@ -1642,9 +1606,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.DOWNTIME', 'title' => __('Scheduled downtime running.'), 'message' => __('A scheduled downtime is running. Some monitorization data won\'t be available while downtime is taking place.'), - 'url' => ui_get_full_url( - 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list' - ), + 'url' => 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list', ] ); return; @@ -1805,9 +1767,7 @@ class ConsoleSupervisor date('M j, G:i:s ', $next_downtime_begin), date('M j, G:i:s ', $next_downtime_end) ), - 'url' => ui_get_full_url( - 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list' - ), + 'url' => 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list', ] ); return; @@ -1912,9 +1872,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.SECURITY.DEFAULT_PASSWORD', 'title' => __('Default password for "Admin" user has not been changed.'), 'message' => __('Please change the default password because is a common vulnerability reported.'), - 'url' => ui_get_full_url( - 'index.php?sec=gusuarios&sec2=godmode/users/user_list' - ), + 'url' => 'index.php?sec=gusuarios&sec2=godmode/users/user_list', ] ); } else { @@ -1940,9 +1898,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.MISC.FONTPATH', 'title' => __('Default font doesnt exist'), 'message' => __('Your defined font doesnt exist or is not defined. Please check font parameters in your config'), - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=vis' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=vis', ] ); } else { @@ -1969,7 +1925,7 @@ class ConsoleSupervisor 'Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file', get_product_name() ), - 'url' => ui_get_full_url('index.php'), + 'url' => 'index.php', ] ); } else { @@ -1992,9 +1948,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.MISC.EVENTSTORMPROTECTION', 'title' => __('Event storm protection is activated.'), 'message' => __('You need to restart server after altering this configuration setting. No events will be generated during this mode.'), - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general', ] ); } else { @@ -2021,9 +1975,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.UPDATEMANAGER.OPENSETUP', 'title' => __('Error, first setup "Open update".'), 'message' => $message, - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general', ] ); } @@ -2043,9 +1995,7 @@ class ConsoleSupervisor get_product_name() ), 'message' => __('There is a new update available. Please go to Administration:Setup:Update Manager for more details.'), - 'url' => ui_get_full_url( - 'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online' - ), + 'url' => 'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online', ] ); } else { @@ -2132,9 +2082,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.CRON.CONFIGURED', 'title' => __('DiscoveryConsoleTasks is not configured.'), 'message' => __($message_conf_cron), - 'url' => ui_get_full_url( - 'index.php?extension_in_menu=gservers&sec=extensions&sec2=enterprise/extensions/cron' - ), + 'url' => 'index.php?extension_in_menu=gservers&sec=extensions&sec2=enterprise/extensions/cron', ] ); } else {