From 584427de06279bded1d00c27bc4d486273eb77c8 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 14 Feb 2017 09:36:11 +0100 Subject: [PATCH] Added changes to finish rr feature. Ticket #169 --- .../pandoradb_migrate_6.0_to_6.1.mysql.sql | 1 + .../pandoradb_migrate_6.0_to_6.1.oracle.sql | 1 + pandora_console/general/footer.php | 18 ++--- .../include/ajax/rolling_release.ajax.php | 20 +++--- pandora_console/include/api.php | 17 ++--- pandora_console/include/db/mysql.php | 57 +++++++++++----- pandora_console/include/functions.php | 52 +++----------- pandora_console/include/functions_db.php | 67 ++++--------------- pandora_console/index.php | 67 +++++++------------ pandora_console/pandoradb.data.oracle.sql | 1 + pandora_console/pandoradb_data.sql | 2 +- 11 files changed, 116 insertions(+), 187 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql index 594b317f27..69974597c6 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql @@ -156,6 +156,7 @@ ALTER TABLE trel_item ADD `id_map` int(11) NOT NULL DEFAULT 0; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 0); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql index 99f2d54986..65ce80043f 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql @@ -79,6 +79,7 @@ UPDATE talert_commands SET fields_descriptions = '[\"Integria IMS API& INSERT INTO tconfig (token, value) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO tconfig (token, value) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO tconfig (token, value) VALUES ('days_autodisable_deletion', '30'); +INSERT INTO tconfig (token, value) VALUES ('MR', 0); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index d134e8c715..ee4a267796 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -26,22 +26,14 @@ if (! file_exists ($config["homedir"] . $license_file)) { $license_file = 'general/license/pandora_info_en.html'; } -if (!$config["minor_release_open"]) { - $config["minor_release_open"] = 0; -} -if (enterprise_installed()) { - if (!$config["minor_release_enterprise"]) { - $config["minor_release_enterprise"] = 0; - } +if (!$config["MR"]) { + $config["MR"] = 0; } echo ''; -if (enterprise_installed()) { - echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_version, $config["minor_release_enterprise"])); -} -else { - echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_version, $config["minor_release_open"])); -} + +echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_version, $config["MR"])); + echo '
'; echo ''. __('Page generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")); //Always use timestamp here echo ''; diff --git a/pandora_console/include/ajax/rolling_release.ajax.php b/pandora_console/include/ajax/rolling_release.ajax.php index 37da049647..0cf1ead3b7 100644 --- a/pandora_console/include/ajax/rolling_release.ajax.php +++ b/pandora_console/include/ajax/rolling_release.ajax.php @@ -17,13 +17,14 @@ if (is_ajax ()) { global $config; check_login(); - $updare_rr_open = get_parameter('updare_rr_open', 0); + $updare_rr = get_parameter('updare_rr', 0); - if ($updare_rr_open) { + if ($updare_rr) { $number = get_parameter('number'); + $dir = $config["homedir"]."/extras/mr"; - $file = "$dir/$number.open.sql"; + $file = "$dir/$number.sql"; $dangerous_query = false; $mr_file = fopen($file, "r"); @@ -44,30 +45,29 @@ if (is_ajax ()) { else { if (file_exists($dir) && is_dir($dir)) { if (is_readable($dir)) { - if ($config["minor_release_open"] >= $number) { + if ($config["MR"] >= $number) { if (!file_exists($dir."/updated") || !is_dir($dir."/updated")) { mkdir($dir."/updated"); } - $file_dest = "$dir/updated/$number.open.sql"; + $file_dest = "$dir/updated/$number.sql"; if (copy($file, $file_dest)) { unlink($file); } } else { $result = db_run_sql_file($file); - if ($result) { - $update_config = update_config_token("minor_release_open", $number); + $update_config = update_config_token("MR", $number); if ($update_config) { - $config["minor_release_open"] = $number; + $config["MR"] = $number; } - if ($config["minor_release_open"] == $number) { + if ($config["MR"] == $number) { if (!file_exists($dir."/updated") || !is_dir($dir."/updated")) { mkdir($dir."/updated"); } - $file_dest = "$dir/updated/$number.open.sql"; + $file_dest = "$dir/updated/$number.sql"; if (copy($file, $file_dest)) { unlink($file); diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php index 457c63f8b3..375bd072dd 100644 --- a/pandora_console/include/api.php +++ b/pandora_console/include/api.php @@ -56,21 +56,12 @@ $no_login_msg = ""; // Don't change the format, it is parsed by applications switch($info) { case 'version': - if (!$config["minor_release_open"]) { - $config["minor_release_open"] = 0; - } - if (enterprise_installed()) { - if (!$config["minor_release_enterprise"]) { - $config["minor_release_enterprise"] = 0; - } + if (!$config["MR"]) { + $config["MR"] = 0; } - if (enterprise_installed()) { - echo 'Pandora FMS ' . $pandora_version . ' - ' . $build_version . " MR" . $config["minor_release_enterprise"]; - } - else { - echo 'Pandora FMS ' . $pandora_version . ' - ' . $build_version . " MR" . $config["minor_release_open"]; - } + echo 'Pandora FMS ' . $pandora_version . ' - ' . $build_version . " MR" . $config["MR"]; + exit; } diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php index 5aa9a2ac40..4624d5bd94 100644 --- a/pandora_console/include/db/mysql.php +++ b/pandora_console/include/db/mysql.php @@ -37,9 +37,9 @@ function mysql_connect_db($host = null, $db = null, $user = null, $pass = null, // Non-persistent connection: This will help to avoid mysql errors like "has gone away" or locking problems // If you want persistent connections change it to mysql_pconnect(). - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { $connect_id = mysqli_connect($host, $user, $pass, $db, $port); - if (mysqli_connect_error() > 0) { + if (mysqli_connect_errno() > 0) { return false; } db_change_cache_id ($db, $host); @@ -1080,7 +1080,7 @@ function mysql_db_get_all_row_by_steps_sql($new = true, &$result, $sql = null) { function mysql_db_process_sql_begin() { global $config; - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { mysqli_query ($config['dbconnection'], 'SET AUTOCOMMIT = 0'); mysqli_query ($config['dbconnection'], 'START TRANSACTION'); } @@ -1096,7 +1096,7 @@ function mysql_db_process_sql_begin() { function mysql_db_process_sql_commit() { global $config; - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { mysqli_query ($config['dbconnection'], 'COMMIT'); mysqli_query ($config['dbconnection'], 'SET AUTOCOMMIT = 1'); } @@ -1112,7 +1112,7 @@ function mysql_db_process_sql_commit() { function mysql_db_process_sql_rollback() { global $config; - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { mysqli_query ($config['dbconnection'], 'ROLLBACK '); mysqli_query ($config['dbconnection'], 'SET AUTOCOMMIT = 1'); } @@ -1144,7 +1144,7 @@ function mysql_safe_sql_string($string) { function mysql_db_get_last_error() { global $config; - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { return mysqli_error(); } else { @@ -1188,7 +1188,7 @@ function mysql_get_system_time() { function mysql_db_get_type_field_table($table, $field) { global $config; - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { $result = mysqli_query($config['dbconnection'], 'SELECT parameters FROM ' . $table); return mysqli_fetch_field_direct($result, $field); @@ -1221,7 +1221,7 @@ function mysql_db_get_table_count($sql, $search_history_db = false) { // Connect to the history DB if (! isset ($config['history_db_connection']) || $config['history_db_connection'] === false) { - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { $config['history_db_connection'] = mysqli_connect_db ($config['history_db_host'], $config['history_db_user'], io_output_password($config['history_db_pass']), $config['history_db_name'], $config['history_db_port'], false); } else { @@ -1272,7 +1272,7 @@ function mysql_db_process_file ($path, $handle_error = true) { $query .= $sql_line; if (preg_match("/;[\040]*\$/", $sql_line)) { - if ($config["mysqli"] === true) { + if ($config["mysqli"]) { $query_result = mysqli_query($config['dbconnection'], $query); } else { @@ -1325,7 +1325,6 @@ function db_run_sql_file ($location) { // Load file $commands = file_get_contents($location); - // Delete comments $lines = explode("\n", $commands); $commands = ''; @@ -1339,23 +1338,51 @@ function db_run_sql_file ($location) { // Convert to array $commands = explode(";", $commands); - // Run commands - mysql_db_process_sql_begin(); // Begin transaction + if ($config['mysqli']) { + $mysqli = new mysqli($config["dbhost"], $config["dbuser"], $config["dbpass"], $config["dbname"], $config["dbport"]); + + // Run commands + $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 0'); + $mysqli->query($config['dbconnection'], 'START TRANSACTION'); + } + else { + // Run commands + mysql_db_process_sql_begin(); // Begin transaction + } + foreach ($commands as $command) { if (trim($command)) { - $result = mysql_query($command); + if ($config['mysqli']) { + $result = $mysqli->query($command); + } + else { + $result = mysql_query($command); + } if (!$result) { break; // Error } } } + if ($result) { - mysql_db_process_sql_commit(); // Save results + if ($config['mysqli']) { + $mysqli->query($config['dbconnection'], 'COMMIT'); + $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1'); + } + else { + mysql_db_process_sql_commit(); // Save results + } return true; } else { - mysql_db_process_sql_rollback(); // Undo results + if ($config['mysqli']) { + $mysqli->query($config['dbconnection'], 'ROLLBACK '); + $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1'); + } + else { + mysql_db_process_sql_rollback(); // Undo results + } return false; } } diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index a9b429caef..c16cb4debe 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2681,17 +2681,7 @@ function update_config_token ($cfgtoken, $cfgvalue) { } } -function update_conf_minor_release() { - global $config; - - $config['minor_release_open'] = db_get_value ('value', 'tconfig', 'token', 'minor_release_open'); - - if (enterprise_installed()) { - $config['minor_release_enterprise'] = db_get_value ('value', 'tconfig', 'token', 'minor_release_enterprise'); - } -} - -function get_number_of_mr($mode) { +function get_number_of_mr() { global $config; $dir = $config["homedir"]."/extras/mr"; @@ -2699,37 +2689,17 @@ function get_number_of_mr($mode) { if (file_exists($dir) && is_dir($dir)) { if (is_readable($dir)) { - if ($mode == 'open') { - $files = scandir($dir); // Get all the files from the directory ordered by asc + $files = scandir($dir); // Get all the files from the directory ordered by asc + + if ($files !== false) { + $pattern = "/^\d+\.sql$/"; + $sqlfiles = preg_grep($pattern, $files); // Get the name of the correct files + $pattern = "/\.sql$/"; + $replacement = ""; + $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); - if ($files !== false) { - $pattern = "/^\d+\.open\.sql$/"; - $sqlfiles = preg_grep($pattern, $files); // Get the name of the correct files - $pattern = "/\.open\.sql$/"; - $replacement = ""; - $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); - - foreach ($sqlfiles_num as $num) { - $mr_size[] = $num; - } - } - } - else { - if (enterprise_installed()) { - $files2 = scandir($dir); // Get all the files from the directory ordered by asc - - if ($files2 !== false) { - $pattern2 = "/^\d+\.ent\.sql$/"; - $sqlfiles2 = preg_grep($pattern2, $files2); // Get the name of the correct files - - $pattern2 = "/\.ent\.sql$/"; - $replacement2 = ""; - $sqlfiles_num2 = preg_replace($pattern2, $replacement2, $sqlfiles2); // Get the number of the file - - foreach ($sqlfiles_num2 as $num2) { - $mr_size[] = $num2; - } - } + foreach ($sqlfiles_num as $num) { + $mr_size[] = $num; } } } diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 88d8d9a963..6b5fcb4d1b 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1682,63 +1682,24 @@ function db_check_minor_relase_available () { $dir = $config["homedir"]."/extras/mr"; - $have_ent_minor = false; - $have_open_minor = false; + $have_minor_release = false; if (file_exists($dir) && is_dir($dir)) { if (is_readable($dir)) { $files = scandir($dir); // Get all the files from the directory ordered by asc + if ($files !== false) { - // Enterprise installed - if (enterprise_installed()) { - $pattern = "/^\d+\.open\.sql$/"; - $sqlfiles = preg_grep($pattern, $files); // Get the name of the correct files - $pattern = "/\.open\.sql$/"; - $replacement = ""; - $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); // Get the number of the file - - $sqlfiles = null; - - if ($sqlfiles_num) { - foreach ($sqlfiles_num as $sqlfile_num) { - if ($config["minor_release_open"] < $sqlfile_num) { - $have_open_minor = true; - } - } - } - - $pattern2 = "/^\d+\.ent\.sql$/"; - $sqlfiles2 = preg_grep($pattern2, $files); // Get the name of the correct files - $files = null; - $pattern2 = "/\.ent\.sql$/"; - $replacement2 = ""; - $sqlfiles_num2 = preg_replace($pattern2, $replacement2, $sqlfiles2); // Get the number of the file - - $sqlfiles2 = null; - - if ($sqlfiles_num2) { - foreach ($sqlfiles_num2 as $sqlfile_num2) { - if ($config["minor_release_enterprise"] < $sqlfile_num2) { - $have_ent_minor = true; - } - } - } - } - else { - $pattern = "/^\d+\.open.sql$/"; - $sqlfiles = preg_grep($pattern, $files); // Get the name of the correct files - $files = null; - $pattern = "/\.open.sql$/"; - $replacement = ""; - $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); // Get the number of the file - - $sqlfiles = null; - - if ($sqlfiles_num) { - foreach ($sqlfiles_num as $sqlfile_num) { - if ($config["minor_release"] < $sqlfile_num) { - $have_open_minor = true; - } + $pattern = "/^\d+\.sql$/"; + $sqlfiles = preg_grep($pattern, $files); // Get the name of the correct files + $files = null; + $pattern = "/\.sql$/"; + $replacement = ""; + $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); // Get the number of the file + + if ($sqlfiles_num) { + foreach ($sqlfiles_num as $sqlfile_num) { + if ($config["MR"] < $sqlfile_num) { + $have_minor_release = true; } } } @@ -1746,7 +1707,7 @@ function db_check_minor_relase_available () { } } - if ($have_open_minor || $have_ent_minor) { + if ($have_minor_release) { return true; } else { diff --git a/pandora_console/index.php b/pandora_console/index.php index 8b6a62fb0c..6d4fcccf43 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -469,8 +469,7 @@ if (! isset ($config['id_user'])) { } if ($have_minor_releases) { - $size_mr_o = get_number_of_mr('open'); - $size_mr_e = get_number_of_mr('enterprise'); + $size_mr = get_number_of_mr(); echo "
" . __('') . "
"; ?>