[Rebranding] Minor ended fixed

pandora_console/extensions/plugin_registration.php

@@ -31,10 +31,10 @@ function pluginreg_extension_main () {
 			echo '</div>';
 				echo '<div class="text_task">';
 					echo '<h3>' . __("Plugin registration") . '</h3>';
-					echo '<p id="description_task">' . 
+					echo '<p id="description_task">' .
-					__("This extension makes registration of server plugins more easy. 
+					__("This extension makes registering server plugins an easier task.
-						Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). 
+						Here you can upload a server plugin in .pspz zipped format.
-						Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.
+						Please refer to the official documentation on how to obtain and use Server Plugins.
 						<br><br>You can get more plugins in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a> ") . '</p>';
 						// Upload form
 					echo "<form name='submit_plugin' method='post' enctype='multipart/form-data'>";

pandora_console/extensions/resource_registration.php

@@ -857,9 +857,9 @@ function resource_registration_extension_main() {
 	echo "<div class=notify>";
 	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()) . " " .
 		"<br> <br>" .
-		__("You can get more resurces in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</a>")
+		__("You can get more resurces in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a>")
 	;
 	echo "</div>";
 	

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.<br><br>
-  <a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
+  <a href='%s' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
-  get_product_name(), get_product_name(), get_product_name());
+  get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']);
 	
 	break;
 	

pandora_console/general/login_help_dialog.php

@@ -71,11 +71,11 @@ echo '<div id="login_help_dialog" title="' .
 			echo '</td>';
 			
 			echo '<td style="border:1px solid #FFF; text-align:center;">';
-				echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' .
+				echo '<a href="' . $config['custom_docs_url'] . '" target="_blank" style="text-decoration:none;">' .
 					html_print_image('images/documentation.png', true,
 						array("alt" => __('Documentation'), "border" => 0)) . '</a>';
 				echo '<br style="margin-bottom: 40px;" />';
-				echo '<a style="font-size: 9pt;" href="http://pandorafms.com/pandora/doc/en" target="_blank">' . __('Documentation') . '</span></a>';
+				echo '<a style="font-size: 9pt;" href="' . $config['custom_docs_url'] . '" target="_blank">' . __('Documentation') . '</span></a>';
 			echo '</td>';
 		echo '</tr>';
 		echo '</table>';

pandora_console/godmode/agentes/agent_manager.php

@@ -542,7 +542,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('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',

pandora_console/godmode/agentes/module_manager.php

@@ -154,7 +154,7 @@ echo "</table>";
 
 echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
 echo "<strong>";
-echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
+echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
 echo "</strong>";
 echo '</div>';
 

pandora_console/godmode/massive/massive_edit_agents.php

@@ -507,7 +507,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('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));

pandora_console/include/auth/dev.php

@@ -27,9 +27,8 @@ if (!isset ($config)) {
 <meta http-equiv="content-type" content="text/html; charset=utf8">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
-<meta name="author" content="Sancho Lerena">
+<meta name="author" content="Artica ST">
-<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
+<meta name="copyright" content="(c) Artica ST">
-<meta name="keywords" content="pandora, monitoring, system, GPL, software">
 <meta name="robots" content="index, follow">
 <link rel="icon" href="../../images/pandora.ico" type="image/ico">
 <link rel="stylesheet" href="../styles/pandora.css" type="text/css">

pandora_console/include/auth/ldap.php

@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
+		<meta name="author" content="Artica ST">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
+		<meta name="copyright" content="(c) Artica ST">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">

pandora_console/include/auth/mysql.php

@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
+		<meta name="author" content="Artica ST">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
+		<meta name="copyright" content="(c) Artica ST">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">

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 = '<TR><TD>' .
-			"<img src='" . $config['homedir'] . '/' . networkmap_get_center_logo() . "' />" .
+			"<img src='" . $config['homedir'] . '/' . ui_get_logo_to_center_networkmap() . "' />" .
 			'</TD></TR>';
 	}
 	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 = '<TR><TD>' . $image . '</TD></TR>';
 	}
@@ -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'];
-}
-
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {

pandora_console/include/functions_ui.php

@@ -1352,9 +1352,8 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta name="resource-type" content="document" />
 		<meta name="distribution" content="global" />
-		<meta name="author" content="Pandora FMS Developer team" />
+		<meta name="author" content="' . get_copyright_notice() . '" />
-		<meta name="copyright" content="(c) Artica Soluciones Tecnologicas" />
+		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software" />
 		<meta name="robots" content="index, follow" />';
 		if(defined ('METACONSOLE')){
 		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
@@ -3973,4 +3972,19 @@ function ui_get_custom_header_logo () {
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
 
+/**
+ * Get the central networkmap logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_logo_to_center_networkmap () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
+		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
 ?>

pandora_console/include/help/en/help_main_help.php

@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Help index</h1>
 <h3>Introduction</h3>
 <p>
-This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
+This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is large, and you probably don't need to read it entirely, but sure, you should download it and take a look.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Download the official documentation</b></a>
  
 </p>

pandora_console/include/help/es/help_main_help.php

@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Índice de la ayuda</h1>
 <h3>Introdución</h3>
 <p>
-Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
+Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> es larga, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Descargue la documentación oficial</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Descargue la documentación oficial</b></a>
  
 </p>

pandora_console/include/help/ja/help_main_help.php

@@ -9,6 +9,6 @@
 これは、<?php echo get_product_name();?> コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、<?php echo get_product_name();?> の使い方を教えることを意図しているわけではありません。<?php echo get_product_name();?> の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>公式ドキュメントのダウンロード</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>公式ドキュメントのダウンロード</b></a>
  
 </p>

pandora_console/operation/agentes/pandora_networkmap.view.php

@@ -702,7 +702,7 @@ else {
 
 // Print some params to handle it in js
 html_print_input_hidden ('product_name', get_product_name());
-html_print_input_hidden ('center_logo', ui_get_full_url(networkmap_get_center_logo()));
+html_print_input_hidden ('center_logo', ui_get_full_url(ui_get_logo_to_center_networkmap()));
 
 $dash_mode = 0;
 $map_dash_details = array();