comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 148
- c0f0bbfefd63
- parent 147
- e6e5d007eb54
- child 154
- ef298b5aa994
equal
deleted
inserted
replaced
| 147:e6e5d007eb54 | 148:c0f0bbfefd63 |
|---|---|
| 66 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc']; | 66 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc']; |
| 67 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount']; | 67 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount']; |
| 68 $sql .= "', mash_ph='" . $_POST['mash_ph']; | 68 $sql .= "', mash_ph='" . $_POST['mash_ph']; |
| 69 $sql .= "', mash_name='" . $_POST['mash_name']; | 69 $sql .= "', mash_name='" . $_POST['mash_name']; |
| 70 $sql .= "', calc_acid='" . $_POST['calc_acid']; | 70 $sql .= "', calc_acid='" . $_POST['calc_acid']; |
| 71 if (isset($_POST['w1_name'])) { | |
| 72 $sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']); | |
| 73 $sql .= "', w1_amount='" . $_POST['w1_amount']; | |
| 74 $sql .= "', w1_calcium='" . $_POST['w1_calcium']; | |
| 75 $sql .= "', w1_sulfate='" . $_POST['w1_sulfate']; | |
| 76 $sql .= "', w1_chloride='" . $_POST['w1_chloride']; | |
| 77 $sql .= "', w1_sodium='" . $_POST['w1_sodium']; | |
| 78 $sql .= "', w1_magnesium='" . $_POST['w1_magnesium']; | |
| 79 $sql .= "', w1_total_alkalinity='" . $_POST['w1_total_alkalinity']; | |
| 80 $sql .= "', w1_ph='" . $_POST['w1_ph']; | |
| 81 $sql .= "', w1_cost='" . $_POST['w1_cost']; | |
| 82 } | |
| 83 if (isset($_POST['w2_name'])) { | |
| 84 $sql .= "', w2_name='" . mysqli_real_escape_string($connect, $_POST['w2_name']); | |
| 85 $sql .= "', w2_amount='" . $_POST['w2_amount']; | |
| 86 $sql .= "', w2_calcium='" . $_POST['w2_calcium']; | |
| 87 $sql .= "', w2_sulfate='" . $_POST['w2_sulfate']; | |
| 88 $sql .= "', w2_chloride='" . $_POST['w2_chloride']; | |
| 89 $sql .= "', w2_sodium='" . $_POST['w2_sodium']; | |
| 90 $sql .= "', w2_magnesium='" . $_POST['w2_magnesium']; | |
| 91 $sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity']; | |
| 92 $sql .= "', w2_ph='" . $_POST['w2_ph']; | |
| 93 $sql .= "', w2_cost='" . $_POST['w2_cost']; | |
| 94 } | |
| 71 syslog(LOG_NOTICE, $sql); | 95 syslog(LOG_NOTICE, $sql); |
| 72 | 96 |
| 73 if (isset($_POST['fermentables'])) { | 97 if (isset($_POST['fermentables'])) { |
| 74 $array = $_POST['fermentables']; | 98 $array = $_POST['fermentables']; |
| 75 foreach($array as $key => $item){ | 99 foreach($array as $key => $item){ |
| 110 unset($array[$key]["$disallowed_key"]); | 134 unset($array[$key]["$disallowed_key"]); |
| 111 } | 135 } |
| 112 } | 136 } |
| 113 syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array))); | 137 syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array))); |
| 114 $sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array)); | 138 $sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array)); |
| 115 } | |
| 116 | |
| 117 if (isset($_POST['waters'])) { | |
| 118 $array = $_POST['waters']; | |
| 119 foreach($array as $key => $item){ | |
| 120 foreach ($disallowed as $disallowed_key) { | |
| 121 unset($array[$key]["$disallowed_key"]); | |
| 122 } | |
| 123 } | |
| 124 syslog(LOG_NOTICE, "json_waters: ".str_replace($rescapers,$rreplacements,json_encode($array))); | |
| 125 $sql .= "', json_waters='" . str_replace($rescapers,$rreplacements,json_encode($array)); | |
| 126 } | 139 } |
| 127 | 140 |
| 128 if (isset($_POST['mashs'])) { | 141 if (isset($_POST['mashs'])) { |
| 129 $array = $_POST['mashs']; | 142 $array = $_POST['mashs']; |
| 130 foreach($array as $key => $item){ | 143 foreach($array as $key => $item){ |
| 226 $recipes .= '","sparge_acid_perc":' . $row['sparge_acid_perc']; | 239 $recipes .= '","sparge_acid_perc":' . $row['sparge_acid_perc']; |
| 227 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount']; | 240 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount']; |
| 228 $recipes .= ',"mash_ph":' . $row['mash_ph']; | 241 $recipes .= ',"mash_ph":' . $row['mash_ph']; |
| 229 $recipes .= ',"mash_name":"' . $row['mash_name']; | 242 $recipes .= ',"mash_name":"' . $row['mash_name']; |
| 230 $recipes .= '","calc_acid":' . $row['calc_acid']; | 243 $recipes .= '","calc_acid":' . $row['calc_acid']; |
| 244 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); | |
| 245 $recipes .= '","w1_amount":' . $row['w1_amount']; | |
| 246 $recipes .= ',"w1_calcium":' . $row['w1_calcium']; | |
| 247 $recipes .= ',"w1_sulfate":' . $row['w1_sulfate']; | |
| 248 $recipes .= ',"w1_chloride":' . $row['w1_chloride']; | |
| 249 $recipes .= ',"w1_sodium":' . $row['w1_sodium']; | |
| 250 $recipes .= ',"w1_magnesium":' . $row['w1_magnesium']; | |
| 251 $recipes .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity']; | |
| 252 $recipes .= ',"w1_ph":' . $row['w1_ph']; | |
| 253 $recipes .= ',"w1_cost":' . $row['w1_cost']; | |
| 254 $recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']); | |
| 255 $recipes .= '","w2_amount":' . $row['w2_amount']; | |
| 256 $recipes .= ',"w2_calcium":' . $row['w2_calcium']; | |
| 257 $recipes .= ',"w2_sulfate":' . $row['w2_sulfate']; | |
| 258 $recipes .= ',"w2_chloride":' . $row['w2_chloride']; | |
| 259 $recipes .= ',"w2_sodium":' . $row['w2_sodium']; | |
| 260 $recipes .= ',"w2_magnesium":' . $row['w2_magnesium']; | |
| 261 $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity']; | |
| 262 $recipes .= ',"w2_ph":' . $row['w2_ph']; | |
| 263 $recipes .= ',"w2_cost":' . $row['w2_cost']; | |
| 231 $recipes .= ',"fermentables":' . $row['json_fermentables']; | 264 $recipes .= ',"fermentables":' . $row['json_fermentables']; |
| 232 $recipes .= ',"hops":' . $row['json_hops']; | 265 $recipes .= ',"hops":' . $row['json_hops']; |
| 233 $recipes .= ',"miscs":' . $row['json_miscs']; | 266 $recipes .= ',"miscs":' . $row['json_miscs']; |
| 234 $recipes .= ',"yeasts":' . $row['json_yeasts']; | 267 $recipes .= ',"yeasts":' . $row['json_yeasts']; |
| 235 $recipes .= ',"waters":' . $row['json_waters']; | |
| 236 $recipes .= ',"mashs":' . $row['json_mashs']; | 268 $recipes .= ',"mashs":' . $row['json_mashs']; |
| 237 $recipes .= '}'; | 269 $recipes .= '}'; |
| 238 } | 270 } |
| 239 $recipes .= ']'; | 271 $recipes .= ']'; |
| 240 header("Content-type: application/json"); | 272 header("Content-type: application/json"); |
