2013-07-03 Sergio Martin <sergio.martin@artica.es>

* include/functions_config.php
	include/help/en/help_custom_logo.php
	include/help/es/help_custom_logo.php
	include/help/ja/help_custom_logo.php
	images/custom_logo/sourceforge.jpg
	images/custom_logo/pandora_logo_head.jpg
	images/custom_logo/artica_logo.png
	images/custom_logo/sourceforge.png
	images/custom_logo/pandora_logo_head.png
	images/custom_logo/none.jpg
	images/pandora_header_logo_enterprise.png
	images/pandora_header_logo.png
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	general/header.php: Change the old system of custom logo
	to be used in the unique logo (left side) of Pandora FMS 5
	Bug #2241




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,24 @@
+2013-07-03  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_config.php
+	include/help/en/help_custom_logo.php
+	include/help/es/help_custom_logo.php
+	include/help/ja/help_custom_logo.php
+	images/custom_logo/sourceforge.jpg
+	images/custom_logo/pandora_logo_head.jpg
+	images/custom_logo/artica_logo.png
+	images/custom_logo/sourceforge.png
+	images/custom_logo/pandora_logo_head.png
+	images/custom_logo/none.jpg
+	images/pandora_header_logo_enterprise.png
+	images/pandora_header_logo.png
+	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
+	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
+	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
+	general/header.php: Change the old system of custom logo
+	to be used in the unique logo (left side) of Pandora FMS 5
+	Bug #2241
+
 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
 
 	* mobile/index.php, mobile/operation/networkmaps.php,

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql

@@ -1133,3 +1133,9 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE
 
 ALTER TABLE tagente_datos_inc DROP COLUMN id_adi;
 
+-- ---------------------------------------------------------------------
+-- Reset custom logo in tconfig table
+-- ---------------------------------------------------------------------
+
+UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo';
+

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql

@@ -1138,3 +1138,9 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE
 
 ALTER TABLE tagente_datos_inc DROP COLUMN id_adi;
 
+
+-- ---------------------------------------------------------------------
+-- Reset custom logo in tconfig table
+-- ---------------------------------------------------------------------
+
+UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo';

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql

@@ -1128,3 +1128,8 @@ UPDATE tagente_estado SET last_known_status = last_status, last_status = 3 WHERE
 
 ALTER TABLE tagente_datos_inc DROP COLUMN id_adi;
 
+-- ---------------------------------------------------------------------
+-- Reset custom logo in tconfig table
+-- ---------------------------------------------------------------------
+
+UPDATE tconfig SET value = 'pandora_logo_head.png' WHERE token = 'custom_logo';

pandora_console/general/header.php

@@ -34,12 +34,19 @@ config_check();
 		<td style="width:90%;">
 			<a href="index.php?sec=main">
 				<?php
-				if (!defined ('PANDORA_ENTERPRISE')) {
+					$custom_logo = 'images/custom_logo/' . $config['custom_logo'];
-					echo html_print_image('images/pandora_header_logo.png', true, array("alt" => 'Pandora FMS Opensource', "border" => '0'));
+					
-				}
+					if (!defined ('PANDORA_ENTERPRISE')) {
-				else {
+						$logo_title = 'Pandora FMS Opensource';
-					echo html_print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0'));
+					}
-				}
+					else {
+						if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) {
+							$custom_logo = ENTERPRISE_DIR . '/' . $custom_logo;
+						}
+						$logo_title = 'Pandora FMS Enterprise';
+					}
+				
+					echo html_print_image($custom_logo, true, array("alt" => $logo_title, "border" => '0'));
 				?>
 			</a>
 		</td>

pandora_console/include/functions_config.php

@@ -745,7 +745,7 @@ function config_process_config () {
 	}
 	
 	if (!isset ($config["custom_logo"])) {
-		config_update_value ('custom_logo', 'none.png');
+		config_update_value ('custom_logo', 'pandora_logo_head.png');
 	}
 	
 	if (!isset ($config['history_db_enabled'])) {

pandora_console/include/help/en/help_custom_logo.php

@@ -5,7 +5,7 @@
 ?>
 <h1>Custom logo (Branding)</h1>
 
-This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 139x60 pixels. 
+This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels. 
 <br><br>
 Upload your custom branding logo, using the file manager to /images/custom_logo directory.
 

pandora_console/include/help/es/help_custom_logo.php

@@ -5,7 +5,7 @@
 ?>
 <h1> Logo de Cliente (Marca comunitaria de empresa)</h1>
 
-Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 139x60 píxeles.
+Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
 
 <br><br>
 

pandora_console/include/help/ja/help_custom_logo.php

@@ -7,6 +7,6 @@
 
 ここに指定した画像ファイルを、オリジナルロゴとして Pandora FMS のヘッダーに表示することができます。
 表示可能な画像ファイルは PNG 形式です。
-画像サイズは、139x60ピクセルに修正されます。
+画像サイズは、206x47ピクセルに修正されます。
 <br><br>
 カスタムロゴは、ファイルマネージャを使って /images/custom_logo ディレクトリへアップロードしてください。