diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d6871d3c08..ecb2d7dd9d 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0RC1-150831 +Version: 6.0RC1-150901 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 1a483e88f3..8a57632fe2 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.0RC1-150831" +pandora_version="6.0RC1-150901" 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 7ce34bad46..2842cc1ddd 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.0RC1'; -use constant AGENT_BUILD => '150831'; +use constant AGENT_BUILD => '150901'; # 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 0e4b713c84..03bdf00f50 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.0RC1 -%define release 150831 +%define release 150901 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 4de1f8273f..32822ec7ae 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.0RC1 -%define release 150831 +%define release 150901 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 bb91e53678..89293571dd 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{150831} +{150901} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index efdee09e4f..f51d97b49e 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.0RC1(Build 150831)") +#define PANDORA_VERSION ("6.0RC1(Build 150901)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 1fcd891c5d..9056194b13 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.0RC1(Build 150831))" + VALUE "ProductVersion", "(6.0RC1(Build 150901))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e8624a0c9e..abfd58b42c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0RC1-150831 +Version: 6.0RC1-150901 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 387b0d7456..d431525ddb 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.0RC1-150831" +pandora_version="6.0RC1-150901" package_pear=0 package_pandora=1 diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php index a6248a54d3..fd9a233371 100644 --- a/pandora_console/extensions/system_info.php +++ b/pandora_console/extensions/system_info.php @@ -86,13 +86,13 @@ function getPandoraDiagnostic(&$systemInfo) { $systemInfo['current_update'] = db_get_sql("SELECT value FROM tupdate_settings WHERE \"key\" = 'current_update'"); break; case "oracle": - $systemInfo['db_scheme_version'] = db_get_sql("SELECT value FROM tconfig WHERE token = 'db_scheme_version'"); - $systemInfo['db_scheme_build'] = db_get_sql("SELECT value FROM tconfig WHERE token = 'db_scheme_build'"); - $systemInfo['enterprise_installed'] = db_get_sql("SELECT value FROM tconfig WHERE token = 'enterprise_installed'"); - $systemInfo['db_maintance'] = db_get_sql ("SELECT value FROM tconfig WHERE token = 'db_maintance'"); - $systemInfo['customer_key'] = db_get_sql("SELECT value FROM tupdate_settings WHERE key = 'customer_key';"); - $systemInfo['updating_code_path'] = db_get_sql("SELECT value FROM tupdate_settings WHERE key = 'updating_code_path'"); - $systemInfo['current_update'] = db_get_sql("SELECT value FROM tupdate_settings WHERE key = 'current_update'"); + $systemInfo['db_scheme_version'] = db_get_sql("SELECT \"value\" FROM tconfig WHERE \"token\" = 'db_scheme_version'"); + $systemInfo['db_scheme_build'] = db_get_sql("SELECT \"value\" FROM tconfig WHERE \"token\" = 'db_scheme_build'"); + $systemInfo['enterprise_installed'] = db_get_sql("SELECT \"value\" FROM tconfig WHERE \"token\" = 'enterprise_installed'"); + $systemInfo['db_maintance'] = db_get_sql ("SELECT \"value\" FROM tconfig WHERE \"token\" = 'db_maintance'"); + $systemInfo['customer_key'] = db_get_sql("SELECT \"value\" FROM tupdate_settings WHERE \"key =\" 'customer_key';"); + $systemInfo['updating_code_path'] = db_get_sql("SELECT \"value\" FROM tupdate_settings WHERE \"key =\" 'updating_code_path'"); + $systemInfo['current_update'] = db_get_sql("SELECT \"value\" FROM tupdate_settings WHERE \"key =\" 'current_update'"); break; } } diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php index 70375aa7e9..85078f3741 100644 --- a/pandora_console/godmode/setup/license.php +++ b/pandora_console/godmode/setup/license.php @@ -30,7 +30,7 @@ if ($update_settings) { foreach ($_POST['keys'] as $key => $value) { db_process_sql_update( 'tupdate_settings', - array('value' => $value), + array(db_escape_key_identifier('value') => $value), array(db_escape_key_identifier('key') => $key)); } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index cfd5b894cf..b207b6458c 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 = 'PC150831'; +$build_version = 'PC150901'; $pandora_version = 'v6.0RC1'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index a07b3f62f6..c591e05267 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -178,7 +178,7 @@ function config_update_config () { if ($update_manager_installed == 1) { $license_info_key = get_parameter('license_info_key', ''); if (!empty($license_info_key)) { - $values = array("value" => $license_info_key); + $values = array(db_escape_key_identifier('value') => $license_info_key); $where = array(db_escape_key_identifier('key') => 'customer_key'); $update_manage_settings_result = db_process_sql_update('tupdate_settings', $values, $where); if ($update_manage_settings_result === false) diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php index 4b579f9fa7..11f9c14acf 100755 --- a/pandora_console/include/functions_update_manager.php +++ b/pandora_console/include/functions_update_manager.php @@ -25,7 +25,7 @@ function update_manager_get_config_values() { global $pandora_version; $license = db_get_value( - 'value', + db_escape_key_identifier('value'), 'tupdate_settings', db_escape_key_identifier('key'), 'customer_key'); @@ -480,7 +480,7 @@ function update_manager_set_current_package($current_package) { $token = 'current_package'; } - $col_value = 'value'; + $col_value = db_escape_key_identifier('value'); $col_key = db_escape_key_identifier('key'); $value = db_get_value($col_value, @@ -507,7 +507,7 @@ function update_manager_get_current_package() { $token = 'current_package'; } $current_update = db_get_value( - 'value', + db_escape_key_identifier('value'), 'tupdate_settings', db_escape_key_identifier('key'), $token); diff --git a/pandora_console/install.php b/pandora_console/install.php index b3b665c969..a28120a6fd 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@