# HG changeset patch # User Michiel Broek # Date 1551453567 -3600 # Node ID bb55e065888a0717d5ce5eb1ec1c11973e3c1b79 # Parent c0ca21cdd291f403c6550c481e3b1c7974c5b207 Fix escape single quotes diff -r c0ca21cdd291 -r bb55e065888a www/prod_duplicate.php --- a/www/prod_duplicate.php Fri Mar 01 14:49:33 2019 +0100 +++ b/www/prod_duplicate.php Fri Mar 01 16:19:27 2019 +0100 @@ -10,6 +10,9 @@ return 1; } +$rescapers = array("'"); +$rreplacements = array("\\'"); + date_default_timezone_set('Europe/Amsterdam'); if (isset($_GET["record"])) $record = $_GET["record"]; @@ -197,11 +200,11 @@ $sql .= "', prop3_volume='" . $row['prop3_volume']; $sql .= "', prop4_type='" . $row['prop4_type']; $sql .= "', prop4_volume='" . $row['prop4_volume']; -$sql .= "', json_fermentables='" . $row['json_fermentables']; -$sql .= "', json_hops='" . $row['json_hops']; -$sql .= "', json_miscs='" . $row['json_miscs']; -$sql .= "', json_yeasts='" . $row['json_yeasts']; -$sql .= "', json_mashs='" . $row['json_mashs']; +$sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,$row['json_fermentables']); +$sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,$row['json_hops']); +$sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,$row['json_miscs']); +$sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,$row['json_yeasts']); +$sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,$row['json_mashs']); $sql .= "';"; syslog(LOG_NOTICE, $sql); diff -r c0ca21cdd291 -r bb55e065888a www/prod_torecipe.php --- a/www/prod_torecipe.php Fri Mar 01 14:49:33 2019 +0100 +++ b/www/prod_torecipe.php Fri Mar 01 16:19:27 2019 +0100 @@ -11,6 +11,9 @@ return 1; } +$rescapers = array("'"); +$rreplacements = array("\\'"); + date_default_timezone_set('Europe/Amsterdam'); if (isset($_GET["record"])) $record = $_GET["record"]; @@ -91,11 +94,11 @@ $sql .= "', wa_acid_name='" . $row['wa_acid_name']; $sql .= "', wa_acid_perc='" . $row['wa_acid_perc']; $sql .= "', wa_base_name='" . $row['wa_base_name']; -$sql .= "', json_fermentables='" . $row['json_fermentables']; -$sql .= "', json_hops='" . $row['json_hops']; -$sql .= "', json_miscs='" . $row['json_miscs']; -$sql .= "', json_yeasts='" . $row['json_yeasts']; -$sql .= "', json_mashs='" . $row['json_mashs']; +$sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,$row['json_fermentables']); +$sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,$row['json_hops']); +$sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,$row['json_miscs']); +$sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,$row['json_yeasts']); +$sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,$row['json_mashs']); $sql .= "';"; syslog(LOG_NOTICE, $sql); diff -r c0ca21cdd291 -r bb55e065888a www/rec_duplicate.php --- a/www/rec_duplicate.php Fri Mar 01 14:49:33 2019 +0100 +++ b/www/rec_duplicate.php Fri Mar 01 16:19:27 2019 +0100 @@ -10,6 +10,9 @@ return 1; } +$rescapers = array("'"); +$rreplacements = array("\\'"); + date_default_timezone_set('Europe/Amsterdam'); if (isset($_GET["record"])) $record = $_GET["record"]; @@ -90,11 +93,11 @@ $sql .= "', wa_acid_name='" . $row['wa_acid_name']; $sql .= "', wa_acid_perc='" . $row['wa_acid_perc']; $sql .= "', wa_base_name='" . $row['wa_base_name']; -$sql .= "', json_fermentables='" . $row['json_fermentables']; -$sql .= "', json_hops='" . $row['json_hops']; -$sql .= "', json_miscs='" . $row['json_miscs']; -$sql .= "', json_yeasts='" . $row['json_yeasts']; -$sql .= "', json_mashs='" . $row['json_mashs']; +$sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,$row['json_fermentables']); +$sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,$row['json_hops']); +$sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,$row['json_miscs']); +$sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,$row['json_yeasts']); +$sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,$row['json_mashs']); $sql .= "';"; syslog(LOG_NOTICE, $sql); diff -r c0ca21cdd291 -r bb55e065888a www/rec_toproduct.php --- a/www/rec_toproduct.php Fri Mar 01 14:49:33 2019 +0100 +++ b/www/rec_toproduct.php Fri Mar 01 16:19:27 2019 +0100 @@ -11,6 +11,9 @@ return 1; } +$rescapers = array("'"); +$rreplacements = array("\\'"); + date_default_timezone_set('Europe/Amsterdam'); if (isset($_GET["record"])) $record = $_GET["record"]; @@ -133,11 +136,11 @@ $sql .= "', wa_acid_name='" . $row['wa_acid_name']; $sql .= "', wa_acid_perc='" . $row['wa_acid_perc']; $sql .= "', wa_base_name='" . $row['wa_base_name']; -$sql .= "', json_fermentables='" . $row['json_fermentables']; -$sql .= "', json_hops='" . $row['json_hops']; -$sql .= "', json_miscs='" . $row['json_miscs']; -$sql .= "', json_yeasts='" . $row['json_yeasts']; -$sql .= "', json_mashs='" . $row['json_mashs']; +$sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,$row['json_fermentables']); +$sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,$row['json_hops']); +$sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,$row['json_miscs']); +$sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,$row['json_yeasts']); +$sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,$row['json_mashs']); $sql .= "';"; syslog(LOG_NOTICE, $sql);