diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index 8807fbe153..63c2d56920 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -31,10 +31,10 @@ function pluginreg_extension_main () { echo ''; echo '
'; echo '

' . __("Plugin registration") . '

'; - echo '

' . - __("This extension makes registration of server plugins more easy. - Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). - Please refer to documentation on how to obtain and use Pandora FMS Server Plugins. + echo '

' . + __("This extension makes registering server plugins an easier task. + Here you can upload a server plugin in .pspz zipped format. + Please refer to the official documentation on how to obtain and use Server Plugins.

You can get more plugins in our Public Resource Library ") . '

'; // Upload form echo "
"; diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index 61ae26f55b..9158876901 100755 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -857,9 +857,9 @@ function resource_registration_extension_main() { echo "
"; echo __("This extension makes registering resource templates easier.") . " " . __("Here you can upload a resource template in .ptr format.") . " " . - __("Please refer to our documentation for more information on how to obtain and use Pandora FMS' resources.") . " " . + __("Please refer to our documentation for more information on how to obtain and use %s resources.", get_product_name()) . " " . "

" . - __("You can get more resurces in our Public Resource Library") + __("You can get more resurces in our Public Resource Library") ; echo "
"; diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php index 3b099fe677..ea5d1d97e5 100644 --- a/pandora_console/general/alert_enterprise.php +++ b/pandora_console/general/alert_enterprise.php @@ -94,8 +94,8 @@ switch ($tipo) { case "helpmodal": echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.

- Download the official documentation", - get_product_name(), get_product_name(), get_product_name()); + Download the official documentation", + get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']); break; diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php index c3b05e8553..6e38d4ece0 100644 --- a/pandora_console/general/login_help_dialog.php +++ b/pandora_console/general/login_help_dialog.php @@ -71,11 +71,11 @@ echo '
'; - echo '' . + echo '' . html_print_image('images/documentation.png', true, array("alt" => __('Documentation'), "border" => 0)) . ''; echo '
'; - echo '' . __('Documentation') . ''; + echo '' . __('Documentation') . ''; echo ''; echo ''; echo ''; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 151b47e03a..d4a725a42c 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -542,7 +542,7 @@ foreach ($fields as $field) { . '.
' . __('The format is: [url=\'url to navigate\']\'text to show\'[/url]') . '.

' - . __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]') + . __('e.g.: [url=google.com]Google web search[/url]') , true); $custom_value = db_get_value_filter('description', diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 85f2fd8f5f..145f7312d5 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -154,7 +154,7 @@ echo ""; echo '
'; echo ""; -echo "".__("Get more modules in Pandora FMS Library").""; +echo "".__("Get more modules on Monitoring Library").""; echo ""; echo '
'; diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index 3918ada3be..849101f169 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -507,7 +507,7 @@ foreach ($fields as $field) { . '.
' . __('The format is: [url=\'url to navigate\']\'text to show\'[/url]') . '.

' - . __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]') + . __('e.g.: [url=google.com]Google web search[/url]') , true); $custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente)); diff --git a/pandora_console/include/auth/dev.php b/pandora_console/include/auth/dev.php index 82a3f7d524..8c5774daaa 100644 --- a/pandora_console/include/auth/dev.php +++ b/pandora_console/include/auth/dev.php @@ -27,9 +27,8 @@ if (!isset ($config)) { - - - + + diff --git a/pandora_console/include/auth/ldap.php b/pandora_console/include/auth/ldap.php index a157b1ddd7..30edd77644 100644 --- a/pandora_console/include/auth/ldap.php +++ b/pandora_console/include/auth/ldap.php @@ -28,9 +28,8 @@ if (!isset ($config)) { - - - + + diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index ddc3828c59..705c600943 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -28,9 +28,8 @@ if (!isset ($config)) { - - - + + diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 7578f4bbfd..4e4ad37cee 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -1332,7 +1332,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s } $stats_json = base64_encode(json_encode($summary)); - $img_src = networkmap_get_center_logo(); + $img_src = ui_get_logo_to_center_networkmap(); if (defined('METACONSOLE')) { $url_tooltip = '../../ajax.php?' . @@ -1351,11 +1351,11 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s if ($hack_networkmap_mobile) { $img = '' . - "" . + "" . ''; } else { - $image = html_print_image(networkmap_get_center_logo(), true, false, false, true); + $image = html_print_image(ui_get_logo_to_center_networkmap(), true, false, false, true); //$image = str_replace('"',"'",$image); $img = '' . $image . ''; } @@ -1871,23 +1871,6 @@ function modules_get_all_interfaces($id_agent) { return $return; } -/** - * Get the central networkmap logo - * - * @return string with the path to logo. If it is not set, return the default. - * - */ -function networkmap_get_center_logo () { - global $config; - - html_debug("hola", true); - if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) { - return DEFAULT_NETWORKMAP_CENTER_LOGO; - } - - return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo']; -} - ?>