diff --git a/database_updates.php b/database_updates.php index 051f5f45..e452814e 100644 --- a/database_updates.php +++ b/database_updates.php @@ -790,14 +790,27 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.5'"); } - //if(CURRENT_DATABASE_VERSION == '0.3.5'){ - // Insert queries here required to update to DB version 0.3.6 + if(CURRENT_DATABASE_VERSION == '0.3.5'){ + $installation_id = randomString(32); + + // Update config.php var with new version var for use with docker + file_put_contents("config.php", "\n\$installation_id = '$installation_id';" . PHP_EOL, FILE_APPEND); + + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.6'"); + } + + //if(CURRENT_DATABASE_VERSION == '0.3.6'){ + // Insert queries here required to update to DB version 0.3.7 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.6'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.7'"); //} + + + } else { // Up-to-date } diff --git a/database_version.php b/database_version.php index cf73b8f0..9b03b3e5 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.3.5"); +DEFINE("LATEST_DATABASE_VERSION", "0.3.6"); diff --git a/post.php b/post.php index f8e6c5e5..a1bb98a4 100644 --- a/post.php +++ b/post.php @@ -1215,6 +1215,7 @@ if(isset($_POST['send_telemetry_data'])){ $postdata = http_build_query( array( + 'installation_id' => "$installation_id", 'version' => "$current_version", 'company_name' => "$company_name", 'city' => "$city", diff --git a/settings_telemetry.php b/settings_telemetry.php index a08b43bf..a1488280 100644 --- a/settings_telemetry.php +++ b/settings_telemetry.php @@ -5,6 +5,9 @@

Telemetry

+ +

Installation ID:

+
diff --git a/setup.php b/setup.php index 8c8e8bf7..88b92919 100644 --- a/setup.php +++ b/setup.php @@ -782,6 +782,8 @@ if (isset($_POST['add_database'])) { $password = $_POST['password']; $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); + $installation_id = randomString(32); + // Test database connection before writing it to config.php try { mysqli_connect($host, $username, $password, $database); @@ -800,6 +802,7 @@ if (isset($_POST['add_database'])) { $new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url)); $new_config[] = "\$config_https_only = TRUE;\n"; $new_config[] = "\$repo_branch = 'master';\n"; + $new_config[] = "\$installation_id = '$installation_id';\n"; file_put_contents("config.php", $new_config); @@ -1033,6 +1036,7 @@ if (isset($_POST['add_telemetry'])) { $postdata = http_build_query( array( + 'installation_id' => "$installation_id", 'company_name' => "$company_name", 'city' => "$city", 'state' => "$state",