2008-12-18 Jorge Gonzalez <jorgegonz@artica.es>

* pandoradb_data.sql, pandoradb.sql: removed extra '-' which made the 
          file invalid for mysql population.   

        * include/languages/es.po, include/languages/es.mo: Updated Spanish
          translation.

        * include/languages/index.pot: Updated po template.

        * general/footer.php: changed format_datetime to print_timestamp.

        * godmode/setup/setup.php: moved the enterprise hook so the table 
          fields show properly in both versions. 



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

pandora_console/ChangeLog

@@ -1,3 +1,18 @@
+2008-12-18  Jorge Gonzalez  <jorgegonz@artica.es>
+
+	* pandoradb_data.sql, pandoradb.sql: removed extra '-' which made the 
+	  file invalid for mysql population.
+
+	* include/languages/es.po, include/languages/es.mo: Updated Spanish
+	  translation.
+
+	* include/languages/index.pot: Updated po template.
+
+	* general/footer.php: changed format_datetime to print_timestamp.
+
+	* godmode/setup/setup.php: moved the enterprise hook so the table 
+	  fields show properly in both versions.
+
 2008-12-16  Evi Vanoost <vanooste@rcbi.rochester.edu>
 
 	* general/logon_ok.php, godmode/agentes/modificar_agente.php, 

pandora_console/general/footer.php

@@ -28,16 +28,13 @@ echo "<center>";
 
 
 echo '<a class="white_bold" target="_new" href="general/license/pandora_info_'.$config["language"].'.html">Pandora FMS '.$pandora_version.' - Build '.$build_version.'<br>';
-echo '<a class="white">'. __('Page generated at') . ' '. format_datetime ($time);
+echo '<a class="white">'. __('Page generated at') . ' '. print_timestamp ($time);
 
 if ((isset($develop_bypass)) AND ($develop_bypass == 1)) {
 	echo ' - Saved '.format_numeric ($sql_cache["saved"]).' Queries';
 }
 echo '</a><br>';
-echo '<a href="http://www.mozilla-europe.org/en/firefox/"><img
-src="'.$config["homeurl"].'/images/firefox.png" 
-align="middle"
-title="'.__('Pandora FMS console is best viewed with Firefox web browser').'" /></a>';
+echo '<a href="http://www.mozilla-europe.org/en/firefox/"><img src="'.$config["homeurl"].'/images/firefox.png" align="middle" title="'.__('Pandora FMS console is best viewed with Firefox web browser').'" /></a>';
 echo "</center>";
 
 ?>

pandora_console/godmode/setup/setup.php

@@ -134,11 +134,11 @@ $table->data[15][1] .=  print_radio_button ('prominent_time', "timestamp", '', $
 $table->data[15][1] .= '<br />'.__('Timestamp in rollover').' ';
 $table->data[15][1] .= print_radio_button ('prominent_time', "comparation", '', $config["prominent_time"], true);
 
-enterprise_hook ('load_snmpforward_enterprise');
-
 $table->data[16][0] = __('Automatic update check');
 $table->data[16][1] = print_checkbox ('autoupdate', 1, $config["autoupdate"], true);
 
+enterprise_hook ('load_snmpforward_enterprise');
+
 echo '<form id="form_setup" method="POST" action="index.php?sec=gsetup&amp;sec2=godmode/setup/setup">';
 print_input_hidden ('update_settings', 1);
 print_table ($table);

pandora_console/pandoradb.sql

@@ -17,9 +17,9 @@
 -- PLEASE NO NOT USE MULTILINE COMMENTS 
 -- Because Pandora Installer don't understand them
 -- and fails creating database !!!
---------------------------------------------------------------
+-- -----------------------------------------------------------
 -- Pandora FMS official tables for 2.0 version              --
---------------------------------------------------------------
+-- -----------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `taddress` (
   `id_a` int(10) unsigned NOT NULL auto_increment,

pandora_console/pandoradb_data.sql

@@ -212,10 +212,10 @@ INSERT INTO `ttipo_modulo` VALUES
 (22,'async_data', 6, 'Asyncronous numeric data', 'mod_async_data.png'), 
 (23,'async_string', 8, 'Asyncronous string data', 'mod_async_string.png'),
 (100,'keep_alive',-1,'KeepAlive','mod_keepalive.png');
---Not yet implemented
---(19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'), 
---(20,'image_png',9,'Image PNG data', 'mod_image_png.png');
---(24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png')
+-- Not yet implemented
+-- (19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'), 
+-- (20,'image_png',9,'Image PNG data', 'mod_image_png.png');
+-- (24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png')
 
 -- Categoria field is used to segregate several types (plugin, agents, network) on their data
 -- types, could be used or could be avoided and use directly primary key (id_tipo)