diff -r 23d972f5d784 -r d3d8e3b30a34 www/includes/db_profile_fermentation.php --- a/www/includes/db_profile_fermentation.php Tue Apr 13 16:54:26 2021 +0200 +++ b/www/includes/db_profile_fermentation.php Tue Apr 13 16:55:25 2021 +0200 @@ -10,8 +10,6 @@ } mysqli_set_charset($connect, "utf8" ); -$escapers = array("\\", "/", "\"", "\n", "\r", "\t", "\x08", "\x0c"); -$replacements = array("\\\\", "\\/", "\\\"", "\\n", "\\r", "\\t", "\\f", "\\b"); $rescapers = array("'"); $rreplacements = array("\\'"); @@ -90,7 +88,8 @@ } else { // SELECT COMMAND - $query = "SELECT * FROM profile_fermentation ORDER BY name;"; + $query = "SELECT record,JSON_QUOTE(uuid),JSON_QUOTE(name),inittemp_lo,inittemp_hi,fridgemode,totalsteps,duration,steps "; + $query .= "FROM profile_fermentation ORDER BY name;"; $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect)); $profiles = '['; $comma = FALSE; @@ -101,9 +100,9 @@ } $comma = TRUE; $profiles .= '{"record":' . $row['record']; - $profiles .= ',"uuid":"' . $row['uuid']; - $profiles .= '","name":"' . str_replace($escapers, $replacements, $row['name']); - $profiles .= '","inittemp_lo":' . $row['inittemp_lo']; + $profiles .= ',"uuid":' . $row['JSON_QUOTE(uuid)']; + $profiles .= ',"name":' . $row['JSON_QUOTE(name)']; + $profiles .= ',"inittemp_lo":' . $row['inittemp_lo']; $profiles .= ',"inittemp_hi":' . $row['inittemp_hi']; $profiles .= ',"fridgemode":' . $row['fridgemode']; $profiles .= ',"totalsteps":' . $row['totalsteps'];