From d57ba03f193e2063dc85770eb575221b0c3c5868 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 21 May 2015 13:01:44 +0200 Subject: [PATCH 1/4] Fixed problems with load events when selected all agents,tiquet: #2241 --- pandora_console/operation/events/events_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 76c6d30f59..6619425fb9 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -141,7 +141,7 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use $tags = tags_get_user_tags($config['id_user'], 'ER'); -if ($id_agent == 0 && $text_agent != __('All')) { +if ($id_agent == 0 && $text_agent != '') { $id_agent = -1; } From 400cc3c5875ceca1e7986048b5298d7dcd86dff2 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 21 May 2015 15:23:37 +0200 Subject: [PATCH 2/4] If possible selected None own in owner event, tiquet: #2250 --- pandora_console/include/functions_events.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 4fa1f53a4f..9840110cb8 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -481,9 +481,10 @@ function events_change_owner ($id_event, $new_owner = false, $force = false, $me } // If no new_owner is provided, the current user will be the owner - if (empty($new_owner)) { - $new_owner = $config['id_user']; - } + // ** Comment this lines because if possible selected None owner in owner event. TIQUET: #2250*** + //if (empty($new_owner)) { + // $new_owner = $config['id_user']; + //} // Only generate comment when is forced (sometimes is changed the owner when comment) if ($force) { From 0ea32ce1dc8083529cd5ede8dc9311b42b746eeb Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 22 May 2015 00:01:13 +0200 Subject: [PATCH 3/4] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b3ea47c730..54ab32a9f1 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0dev-150521 +Version: 6.0dev-150522 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 795b71d81f..0300b25ef3 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150521" +pandora_version="6.0dev-150522" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 7cb8eea609..d32d5858c2 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0dev'; -use constant AGENT_BUILD => '150521'; +use constant AGENT_BUILD => '150522'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 765789a2fe..53ebdcd224 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150521 +%define release 150522 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index b40515cdad..c4be3f40ad 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150521 +%define release 150522 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 14aedf8ff6..339b1f9281 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{150521} +{150522} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3309831094..bf1fe945ed 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("6.0dev(Build 150521)") +#define PANDORA_VERSION ("6.0dev(Build 150522)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index d380c8de7e..c472d188c1 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(6.0dev(Build 150521))" + VALUE "ProductVersion", "(6.0dev(Build 150522))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 65c6b9d440..20ebdc0791 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0dev-150521 +Version: 6.0dev-150522 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index d702b82872..52fc7e468e 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150521" +pandora_version="6.0dev-150522" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 8c78e274f6..d892c2aaf1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC150521'; +$build_version = 'PC150522'; $pandora_version = 'v6.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 67294e4e9b..f468e2325d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@
Date: Fri, 22 May 2015 12:13:22 +0200 Subject: [PATCH 4/4] Fixed problems with not variable initialized, tiquet: #2238 --- .../godmode/reporting/graph_builder.graph_editor.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index d41a0c778c..b439b09c8a 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -46,7 +46,7 @@ if ($editGraph) { WHERE t2.id_agente_modulo = t1.id_agent_module)) AS agent_name FROM tgraph_source AS t1 - WHERE t1.id_graph = " . $id); + WHERE t1.id_graph = " . $id_graph); $module_array = array(); $weight_array = array(); $agent_array = array(); @@ -62,7 +62,7 @@ if ($editGraph) { $agent_array[] = $graphRow['agent_name']; } - $graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id); + $graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id_graph); $stacked = $graphInTgraph['stacked']; $period = $graphInTgraph['period']; $width = $graphInTgraph['width']; @@ -98,7 +98,7 @@ if(count($module_array) > 0){ echo ""; echo ""; - echo ""; + echo ""; html_print_input_text ('weight', $weight_array[$a], '', 20, 10, false, false); html_print_submit_button ('Ok', 'btn', false, '', false); echo ""; @@ -106,7 +106,7 @@ if(count($module_array) > 0){ echo "
"; echo ""; echo ""; - echo "".html_print_image('images/cross.png', true, array ('title' => __('Delete'))).""; + echo "".html_print_image('images/cross.png', true, array ('title' => __('Delete'))).""; echo ""; } @@ -116,7 +116,7 @@ if(count($module_array) > 0){ //Configuration form echo ''; -echo "
"; +echo ""; echo ""; echo "";