From 485bf8a020a42159a3be10ccfc788c32dea64e2a Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Mon, 2 Nov 2009 16:07:05 +0000
Subject: [PATCH] 2009-11-02 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Updated build/version.
* pandora_console.spec: Updated to release 2; preparing the rc2.
* godmode/agentes/module_manager.php: Fixed a small problem, don't allow
to create network modules if not have the snmpconsole due a bad SQL. Fixed.
* include/api.php: Removed ending line.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2069 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 11 +++++++++++
pandora_console/godmode/agentes/module_manager.php | 2 +-
pandora_console/include/api.php | 2 +-
pandora_console/include/config_process.php | 4 ++--
pandora_console/pandora_console.spec | 2 +-
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4cd311cf16..e5e0d63698 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-02 Sancho Lerena <slerena@artica.es>
+
+ * include/config_process.php: Updated build/version.
+
+ * pandora_console.spec: Updated to release 2; preparing the rc2.
+
+ * godmode/agentes/module_manager.php: Fixed a small problem, don't allow
+ to create network modules if not have the snmpconsole due a bad SQL. Fixed.
+
+ * include/api.php: Removed ending line.
+
2009-10-30 Ramon Novoa <rnovoa@artica.es>
* operation/snmpconsole/snmp_view.php: Added a status filter. Fixed
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index bdbb116a95..770f54020c 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -30,7 +30,7 @@ echo "<tr><td class='datos'>";
// Check if there is at least one server of each type available to assign that
// kind of modules. If not, do not show server type in combo
-$network_available = get_db_sql ("SELECT count(*) from tserver where server_type = 2");
+$network_available = get_db_sql ("SELECT count(*) from tserver where server_type = 1");
$wmi_available = get_db_sql ("SELECT count(*) from tserver where server_type = 6");
$plugin_available = get_db_sql ("SELECT count(*) from tserver where server_type = 4");
$prediction_available = get_db_sql ("SELECT count(*) from tserver where server_type = 5");
diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index c693eadad4..f130c8a737 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -42,4 +42,4 @@ if (isInACL($ipOrigin)) {
else {
echo 'ERROR: Your IP (' . $ipOrigin . ') is not in ACL IP list.';
}
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3df895edc9..7b9469295e 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,8 +22,8 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC091020';
-$pandora_version = 'v3.0RC1';
+$build_version = 'PC091103';
+$pandora_version = 'v3.0RC2';
$config['start_time'] = microtime (true);
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 652dca667a..46181cbc58 100755
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,6 +3,7 @@
#
%define name pandorafms_console
%define version 3.0.0
+%define release 2
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
@@ -15,7 +16,6 @@
Summary: Pandora FMS Console
Name: %{name}
Version: %{version}
-Release: 1
License: GPL
Vendor: Artica ST <info@artica.es>
Source0: %{name}-%{version}.tar.gz