From 08d609ac536577ed0bec570ae96d9c869b489b6d Mon Sep 17 00:00:00 2001 From: raulmateos Date: Mon, 19 Mar 2007 21:27:10 +0000 Subject: [PATCH] 2007-03-19 Raul Mateos * pandoradb.sql, pandoradb_data.sql: Solve small problem in last commit with groups table and language code for more than 5 chars (as ast_es). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 +++++- pandora_console/pandoradb.sql | 2 +- pandora_console/pandoradb_data.sql | 18 +++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4a15bb19c5..489f67be25 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2007-03-19 Raul Mateos + + * pandoradb.sql, pandoradb_data.sql: Solve small problem in last commit + with groups table and language code for more than 5 chars (as ast_es). + 2007-03-19 Sancho Lerena * functions_db.php: Added give_network_profile_name() function. @@ -63,7 +68,6 @@ * include/styles/menu.css: Small colour change in menu border. ->>>>>>> .r393 2007-03-06 Sancho Lerena * include/functions*.php: Some reorganization, moved some funtions diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 9e7c4e44a6..7cd6c38c75 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -412,7 +412,7 @@ CREATE TABLE `tincidencia` ( DROP TABLE IF EXISTS `tlanguage`; CREATE TABLE `tlanguage` ( - `id_language` varchar(5) NOT NULL default '', + `id_language` varchar(6) NOT NULL default '', `name` varchar(100) NOT NULL default '', PRIMARY KEY (`id_language`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 1147a914be..ad750dbcab 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -69,15 +69,15 @@ INSERT INTO `tconfig_os` VALUES (11,'Network','Pandora Network Agent','network.g -- Dumping data for table `tgrupo` -- -INSERT INTO `tgrupo` VALUES (1,'All','world'); -INSERT INTO `tgrupo` VALUES (2,'Servers','server_database'); -INSERT INTO `tgrupo` VALUES (3,'IDS','eye'); -INSERT INTO `tgrupo` VALUES (4,'Firewalls','firewal'); -INSERT INTO `tgrupo` VALUES (8,'Databases','db'); -INSERT INTO `tgrupo` VALUES (9,'Comms','comms'); -INSERT INTO `tgrupo` VALUES (10,'Others','others'); -INSERT INTO `tgrupo` VALUES (11,'Workstations','workstation'); -INSERT INTO `tgrupo` VALUES (12,'Applications','apps'); +INSERT INTO `tgrupo` VALUES (1,'All','world',0); +INSERT INTO `tgrupo` VALUES (2,'Servers','server_database',0); +INSERT INTO `tgrupo` VALUES (3,'IDS','eye',0); +INSERT INTO `tgrupo` VALUES (4,'Firewalls','firewal',0); +INSERT INTO `tgrupo` VALUES (8,'Databases','db',0); +INSERT INTO `tgrupo` VALUES (9,'Comms','comms',0); +INSERT INTO `tgrupo` VALUES (10,'Others','others',0); +INSERT INTO `tgrupo` VALUES (11,'Workstations','workstation',0); +INSERT INTO `tgrupo` VALUES (12,'Applications','apps',0); -- -- Dumping data for table `tlink`