2012-06-20 Vanessa Gil <vanessa.gil@artica.es>

* pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	  godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu 
	there is an option "Timestamp or time comparation" which has not a selected
	value by default.


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

pandora_console/ChangeLog

@@ -1,3 +1,15 @@
+2012-06-20  Vanessa Gil <vanessa.gil@artica.es>
+
+	* pandoradb_data.sql
+	  pandoradb.data.oracle.sql
+	  pandoradb.data.postgreSQL.sql
+	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
+	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
+	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
+	  godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu 
+	there is an option "Timestamp or time comparation" which has not a selected
+	value by default.
+
 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph

pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql

@@ -260,3 +260,9 @@ CREATE TABLE IF NOT EXISTS `tpassword_history` (
   `date_end` DATETIME  NOT NULL DEFAULT 0,
 PRIMARY KEY  (`id_pass`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+-- -----------------------------------------------------
+-- Table `tconfig`
+-- -----------------------------------------------------
+UPDATE tconfig SET `value`='comparation'
+WHERE `token`= 'prominent_time'

pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql

@@ -264,3 +264,8 @@ CREATE TABLE IF NOT EXISTS tpassword_history (
 );
 CREATE SEQUENCE tpassword_history_s INCREMENT BY 1 START WITH 1;
 
+-- -----------------------------------------------------
+-- Table `tconfig`
+-- -----------------------------------------------------
+UPDATE tconfig SET value='comparation'
+WHERE token='prominent_time'

pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql

@@ -251,3 +251,9 @@ CREATE TABLE IF NOT EXISTS "tpassword_history" (
   "date_begin" BIGINT NOT NULL default 0,
   "date_end" BIGINT NOT NULL default 0,
 );
+
+-- -----------------------------------------------------
+-- Table `tconfig`
+-- -----------------------------------------------------
+UPDATE TABLE tconfig SET "value"='comparation'
+WHERE "token"='prominent_time'

pandora_console/godmode/setup/setup_visuals.php

@@ -48,11 +48,19 @@ $table->data[1][0] = __('Date format string') . ui_print_help_icon("date_format"
 $table->data[1][1] = '<em>'.__('Example').'</em> '.date ($config["date_format"]);
 $table->data[1][1] .= html_print_input_text ('date_format', $config["date_format"], '', 30, 100, true);
 
+if($config['prominent_time'] == 'comparation') {
+	$timestamp = false;
+	$comparation = true;
+} else if ($config['prominent_time'] == 'timestamp') {
+	$timestamp = true;
+	$comparation = false;
+}
+
 $table->data[2][0] = __('Timestamp or time comparation') . ui_print_help_icon ("time_stamp-comparation", true);
 $table->data[2][1] = __('Comparation in rollover').' ';
-$table->data[2][1] .= html_print_radio_button ('prominent_time', "comparation", '', $config["prominent_time"], true);
+$table->data[2][1] .= html_print_radio_button ('prominent_time', "comparation", '', $comparation, true);
 $table->data[2][1] .= '<br />'.__('Timestamp in rollover').' ';
-$table->data[2][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $config["prominent_time"], true);
+$table->data[2][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $timestamp, true);
 
 $table->data[3][0] = __('Graph color (min)');
 $table->data[3][1] = html_print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true);

pandora_console/pandoradb.data.oracle.sql

@@ -68,7 +68,7 @@ INSERT INTO tconfig (token, value) VALUES ('date_format', 'F j, Y, g:i a');
 INSERT INTO tconfig (token, value) VALUES ('event_view_hr', 8);
 INSERT INTO tconfig (token, value) VALUES ('loginhash_pwd', ' ');
 INSERT INTO tconfig (token, value) VALUES ('trap2agent', 0);
-INSERT INTO tconfig (token, value) VALUES ('prominent_time', 0);
+INSERT INTO tconfig (token, value) VALUES ('prominent_time', 'comparation');
 INSERT INTO tconfig (token, value) VALUES ('timesource', 'system');
 INSERT INTO tconfig (token, value) VALUES ('realtimestats', '1');
 INSERT INTO tconfig (token, value) VALUES ('stats_interval', '60');

pandora_console/pandoradb.data.postgreSQL.sql

@@ -64,7 +64,7 @@ INSERT INTO "tconfig" ("token", "value") VALUES
 ('event_view_hr', 8),
 ('loginhash_pwd', ''),
 ('trap2agent', 0),
-('prominent_time', 0),
+('prominent_time', 'comparation'),
 ('timesource', 'system'),
 ('realtimestats', '1'),
 ('stats_interval', '60'),

pandora_console/pandoradb_data.sql

@@ -63,7 +63,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('event_view_hr', 8),
 ('loginhash_pwd', ''),
 ('trap2agent', 0),
-('prominent_time', 0),
+('prominent_time', 'comparation'),
 ('timesource', 'system'),
 ('realtimestats', '1'),
 ('stats_interval', '60'),