From b601bd7cbe311197a0bf258fddec139b0167f532 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Sun, 1 Apr 2007 18:29:11 +0000
Subject: [PATCH] 2007-04-01 Raul Mateos <raulofpandora@gmail.com>
* pandoradb.sql, pandoradb_data.sql: Removed comments that
caused some warnings. Solved small bug when adding table tmodule.
Changed (again) HPUX to HP-UX.
* godmode/agentes/modificar_agente.php: Removed some notice error.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 8 ++++++++
pandora_console/godmode/agentes/modificar_agente.php | 2 +-
pandora_console/godmode/modules/module_list.php | 2 +-
pandora_console/pandoradb.sql | 12 ++----------
pandora_console/pandoradb_data.sql | 12 +-----------
5 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 486ba63078..fb2c102f09 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-01 Raul Mateos <raulofpandora@gmail.com>
+
+ * pandoradb.sql, pandoradb_data.sql: Removed comments that
+ caused some warnings. Solved small bug when adding table tmodule.
+ Changed (again) HPUX to HP-UX.
+
+ * godmode/agentes/modificar_agente.php: Removed some notice error.
+
2007-03-28 Sancho Lerena <slerena@artica.es>
* tip.css, pandora.css: Some updates to fix render in tooltips and
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 5c87d1ca10..ea73f389fe 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -131,7 +131,7 @@ value='".$lang_label["show"]."'>
</td>
</form>
</table>";
-if ($ag_group > 1){
+if (isset($ag_group) && $ag_group> 1){
$sql1="SELECT id_agente, nombre, id_grupo, comentarios, id_os
FROM tagente WHERE id_grupo = $ag_group ORDER BY nombre LIMIT $offset, $block_size";
$sql2="SELECT COUNT(id_agente) FROM tagente WHERE id_grupo = $ag_group";
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index fe3fc0a70c..add2359cef 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -63,7 +63,7 @@ if (give_acl($id_user, 0, "PM")==1) {
echo "<th>".$lang_label["icon"]."</th>";
echo "<th>".$lang_label["name"]."</th>";
echo "<th>".$lang_label["type"]."</th>";
- echo "<th>".$lang_label["descripcion"]."</th>";
+ echo "<th>".$lang_label["description"]."</th>";
$sql1='SELECT * FROM ttipo_modulo ORDER BY nombre';
$result=mysql_query($sql1);
$color=0;
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index f4d7ead2ec..358975c739 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -241,8 +241,8 @@ CREATE TABLE `tagente_modulo` (
`flag` tinyint(3) unsigned default '1',
`id_modulo` int(11) unsigned NULL default 0,
PRIMARY KEY (`id_agente_modulo`, `id_agente`),
- KEY `tam_agente` (`id_agente`)
- FOREIGN KEY (id_modulo) REFERENCES tmodule (id_module)
+ KEY `tam_agente` (`id_agente`),
+ FOREIGN KEY (id_modulo) REFERENCES tmodule (id_module)
) ENGINE=InnoDB;
--
@@ -703,13 +703,5 @@ CREATE TABLE `vistas_consola` (
`descripcion` varchar(250) NOT NULL,
PRIMARY KEY (`idVista`)
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 9f30a508cb..f39e60a1fd 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -27,7 +27,7 @@ UNLOCK TABLES;
/*!40000 ALTER TABLE `tconfig_os` DISABLE KEYS */;
LOCK TABLES `tconfig_os` WRITE;
-INSERT INTO `tconfig_os` VALUES (1,'Linux','Linux: All versions','so_linux.gif'),(2,'Solaris','Sun Solaris','so_solaris.gif'),(3,'AIX','IBM AIX','so_aix.gif'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.gif'),(5,'HPUX','HPUX Unix OS','so_hpux.gif'),(6,'BeOS','BeOS','so_beos.gif'),(7,'Cisco','CISCO IOS','so_cisco.gif'),(8,'MacOS','MAC OS','so_mac.gif'),(9,'Windows','Microsoft Windows OS','so_win.gif'),(10,'Other','Other SO','so_other.gif'),(11,'Network','Pandora Network Agent','network.gif');
+INSERT INTO `tconfig_os` VALUES (1,'Linux','Linux: All versions','so_linux.gif'),(2,'Solaris','Sun Solaris','so_solaris.gif'),(3,'AIX','IBM AIX','so_aix.gif'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.gif'),(5,'HP-UX','HPUX Unix OS','so_hpux.gif'),(6,'BeOS','BeOS','so_beos.gif'),(7,'Cisco','CISCO IOS','so_cisco.gif'),(8,'MacOS','MAC OS','so_mac.gif'),(9,'Windows','Microsoft Windows OS','so_win.gif'),(10,'Other','Other SO','so_other.gif'),(11,'Network','Pandora Network Agent','network.gif');
UNLOCK TABLES;
/*!40000 ALTER TABLE `tconfig_os` ENABLE KEYS */;
@@ -156,14 +156,4 @@ UNLOCK TABLES;
LOCK TABLES `tperfil` WRITE;
INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1);
UNLOCK TABLES;
-/*!40000 ALTER TABLE `tperfil` ENABLE KEYS */;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;