comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 220
- 14e349ff2a10
- parent 168
- ce92dc75cb09
- child 221
- a8aabb63fbcc
equal
deleted
inserted
replaced
| 219:4c21eabb3c0e | 220:14e349ff2a10 |
|---|---|
| 34 } | 34 } |
| 35 ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0"; | 35 ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0"; |
| 36 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']); | 36 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']); |
| 37 $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']); | 37 $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']); |
| 38 $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']); | 38 $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']); |
| 39 $sql .= "', st_type='" . mysqli_real_escape_string($connect, $_POST['st_type']); | 39 $sql .= "', st_type='" . $_POST['st_type']; |
| 40 $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']); | 40 $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']); |
| 41 $sql .= "', st_category_number='" . $_POST['st_category_number']; | 41 $sql .= "', st_category_number='" . $_POST['st_category_number']; |
| 42 $sql .= "', st_og_min='" . $_POST['st_og_min']; | 42 $sql .= "', st_og_min='" . $_POST['st_og_min']; |
| 43 $sql .= "', st_og_max='" . $_POST['st_og_max']; | 43 $sql .= "', st_og_max='" . $_POST['st_og_max']; |
| 44 $sql .= "', st_fg_min='" . $_POST['st_fg_min']; | 44 $sql .= "', st_fg_min='" . $_POST['st_fg_min']; |
| 98 $sql .= "', w2_magnesium='" . $_POST['w2_magnesium']; | 98 $sql .= "', w2_magnesium='" . $_POST['w2_magnesium']; |
| 99 $sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity']; | 99 $sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity']; |
| 100 $sql .= "', w2_ph='" . $_POST['w2_ph']; | 100 $sql .= "', w2_ph='" . $_POST['w2_ph']; |
| 101 $sql .= "', w2_cost='" . $_POST['w2_cost']; | 101 $sql .= "', w2_cost='" . $_POST['w2_cost']; |
| 102 } | 102 } |
| 103 $sql .= "', wa_acid_name='" . $_POST['wa_acid_name']; | |
| 104 $sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc']; | |
| 105 $sql .= "', wa_base_name='" . $_POST['wa_base_name']; | |
| 103 syslog(LOG_NOTICE, $sql); | 106 syslog(LOG_NOTICE, $sql); |
| 104 | 107 |
| 108 $fermentables = '['; | |
| 109 $comma = FALSE; | |
| 105 if (isset($_POST['fermentables'])) { | 110 if (isset($_POST['fermentables'])) { |
| 106 $array = $_POST['fermentables']; | 111 $array = $_POST['fermentables']; |
| 107 foreach($array as $key => $item){ | 112 foreach($array as $key => $item){ |
| 108 foreach ($disallowed as $disallowed_key) { | 113 /* |
| 109 unset($array[$key]["$disallowed_key"]); | 114 * Manual encode to json. |
| 110 } | 115 */ |
| 111 } | 116 if ($comma) |
| 112 syslog(LOG_NOTICE, "json_fermentables=: ".str_replace($rescapers,$rreplacements,json_encode($array))); | 117 $fermentables .= ','; |
| 113 $sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,json_encode($array)); | 118 $comma = TRUE; |
| 114 } | 119 $fermentable = '{"f_name":"' . str_replace($rescapers,$rreplacements,$item['f_name']); |
| 115 | 120 $fermentable .= '","f_origin":"' . str_replace($rescapers,$rreplacements,$item['f_origin']); |
| 121 $fermentable .= '","f_supplier":"' . str_replace($rescapers,$rreplacements,$item['f_supplier']); | |
| 122 $fermentable .= '","f_amount":' . $item['f_amount']; | |
| 123 $fermentable .= ',"f_cost":' . $item['f_cost']; | |
| 124 $fermentable .= ',"f_type":' . $item['f_type']; | |
| 125 $fermentable .= ',"f_yield":' . $item['f_yield']; | |
| 126 $fermentable .= ',"f_color":' . $item['f_color']; | |
| 127 $fermentable .= ',"f_coarse_fine_diff":' . $item['f_coarse_fine_diff']; | |
| 128 $fermentable .= ',"f_moisture":' . $item['f_moisture']; | |
| 129 $fermentable .= ',"f_diastatic_power":' . $item['f_diastatic_power']; | |
| 130 $fermentable .= ',"f_protein":' . $item['f_protein']; | |
| 131 $fermentable .= ',"f_dissolved_protein":' . $item['f_dissolved_protein']; | |
| 132 $fermentable .= ',"f_max_in_batch":' . $item['f_max_in_batch']; | |
| 133 $fermentable .= ',"f_graintype":' . $item['f_graintype']; | |
| 134 $fermentable .= ',"f_added":' . $item['f_added']; | |
| 135 $fermentable .= ',"f_recommend_mash":' . $item['f_recommend_mash']; | |
| 136 $fermentable .= ',"f_add_after_boil":' . $item['f_add_after_boil']; | |
| 137 $fermentable .= ',"f_adjust_to_total_100":' . $item['f_adjust_to_total_100']; | |
| 138 $fermentable .= ',"f_percentage":' . $item['f_percentage']; | |
| 139 $fermentable .= ',"f_di_ph":' . $item['f_di_ph']; | |
| 140 $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}'; | |
| 141 syslog(LOG_NOTICE, $fermentable); | |
| 142 $fermentables .= $fermentable; | |
| 143 } | |
| 144 } | |
| 145 $fermentables .= ']'; | |
| 146 $sql .= "', json_fermentables='" . $fermentables; | |
| 147 | |
| 148 $hops = '['; | |
| 149 $comma = FALSE; | |
| 116 if (isset($_POST['hops'])) { | 150 if (isset($_POST['hops'])) { |
| 117 $array = $_POST['hops']; | 151 $array = $_POST['hops']; |
| 118 foreach($array as $key => $item){ | 152 foreach($array as $key => $item){ |
| 119 foreach ($disallowed as $disallowed_key) { | 153 if ($comma) |
| 120 unset($array[$key]["$disallowed_key"]); | 154 $hops .= ','; |
| 121 } | 155 $comma = TRUE; |
| 122 } | 156 $hop = '{"h_name":"' . str_replace($rescapers,$rreplacements,$item['h_name']); |
| 123 syslog(LOG_NOTICE, "json_hops: ".str_replace($rescapers,$rreplacements,json_encode($array))); | 157 $hop .= '","h_origin":"' . str_replace($rescapers,$rreplacements,$item['h_origin']); |
| 124 $sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,json_encode($array)); | 158 $hop .= '","h_amount":' . $item['h_amount']; |
| 125 } | 159 $hop .= ',"h_cost":' . $item['h_cost']; |
| 160 $hop .= ',"h_type":' . $item['h_type']; | |
| 161 $hop .= ',"h_form":' . $item['h_form']; | |
| 162 $hop .= ',"h_useat":' . $item['h_useat']; | |
| 163 $hop .= ',"h_time":' . $item['h_time']; | |
| 164 $hop .= ',"h_alpha":' . $item['h_alpha']; | |
| 165 $hop .= ',"h_beta":' . $item['h_beta']; | |
| 166 $hop .= ',"h_hsi":' . $item['h_hsi']; | |
| 167 $hop .= ',"h_humulene":' . $item['h_humulene']; | |
| 168 $hop .= ',"h_carophyllene":' . $item['h_carophyllene']; | |
| 169 $hop .= ',"h_cohumulone":' . $item['h_cohumulone']; | |
| 170 $hop .= ',"h_myrcene":' . $item['h_myrcene']; | |
| 171 $hop .= ',"h_total_oil":' . $item['h_total_oil']; | |
| 172 $hop .= ',"h_weight":' . $item['h_weight'] . '}'; | |
| 173 syslog(LOG_NOTICE, $hop); | |
| 174 $hops .= $hop; | |
| 175 } | |
| 176 } | |
| 177 $hops .= ']'; | |
| 178 $sql .= "', json_hops='" . $hops; | |
| 126 | 179 |
| 127 if (isset($_POST['miscs'])) { | 180 if (isset($_POST['miscs'])) { |
| 128 $array = $_POST['miscs']; | 181 $array = $_POST['miscs']; |
| 129 foreach($array as $key => $item){ | 182 foreach($array as $key => $item){ |
| 130 foreach ($disallowed as $disallowed_key) { | 183 foreach ($disallowed as $disallowed_key) { |
| 210 $recipes .= ',"uuid":"' . $row['uuid']; | 263 $recipes .= ',"uuid":"' . $row['uuid']; |
| 211 $recipes .= '","locked":' . $row['locked']; | 264 $recipes .= '","locked":' . $row['locked']; |
| 212 $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']); | 265 $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']); |
| 213 $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']); | 266 $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']); |
| 214 $recipes .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']); | 267 $recipes .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']); |
| 215 $recipes .= '","st_type":"' . str_replace($escapers, $replacements, $row['st_type']); | 268 $recipes .= '","st_type":' . $row['st_type']; |
| 216 $recipes .= '","st_category":"' . str_replace($escapers, $replacements, $row['st_category']); | 269 $recipes .= ',"st_category":"' . str_replace($escapers, $replacements, $row['st_category']); |
| 217 $recipes .= '","st_category_number":' . floatval($row['st_category_number']); | 270 $recipes .= '","st_category_number":' . floatval($row['st_category_number']); |
| 218 $recipes .= ',"st_og_min":' . floatval($row['st_og_min']); | 271 $recipes .= ',"st_og_min":' . floatval($row['st_og_min']); |
| 219 $recipes .= ',"st_og_max":' . floatval($row['st_og_max']); | 272 $recipes .= ',"st_og_max":' . floatval($row['st_og_max']); |
| 220 $recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']); | 273 $recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']); |
| 221 $recipes .= ',"st_fg_max":' . floatval($row['st_fg_max']); | 274 $recipes .= ',"st_fg_max":' . floatval($row['st_fg_max']); |
| 227 $recipes .= ',"st_carb_max":' . floatval($row['st_carb_max']); | 280 $recipes .= ',"st_carb_max":' . floatval($row['st_carb_max']); |
| 228 $recipes .= ',"st_abv_min":' . floatval($row['st_abv_min']); | 281 $recipes .= ',"st_abv_min":' . floatval($row['st_abv_min']); |
| 229 $recipes .= ',"st_abv_max":' . floatval($row['st_abv_max']); | 282 $recipes .= ',"st_abv_max":' . floatval($row['st_abv_max']); |
| 230 $recipes .= ',"name":"' . str_replace($escapers, $replacements, $row['name']); | 283 $recipes .= ',"name":"' . str_replace($escapers, $replacements, $row['name']); |
| 231 $recipes .= '","notes":"' . str_replace($escapers, $replacements, $row['notes']); | 284 $recipes .= '","notes":"' . str_replace($escapers, $replacements, $row['notes']); |
| 232 $recipes .= '","type":"' . $row['type']; | 285 $recipes .= '","type":' . $row['type']; |
| 233 $recipes .= '","batch_size":' . floatval($row['batch_size']); | 286 $recipes .= ',"batch_size":' . floatval($row['batch_size']); |
| 234 $recipes .= ',"boil_size":' . floatval($row['boil_size']); | 287 $recipes .= ',"boil_size":' . floatval($row['boil_size']); |
| 235 $recipes .= ',"boil_time":' . floatval($row['boil_time']); | 288 $recipes .= ',"boil_time":' . floatval($row['boil_time']); |
| 236 $recipes .= ',"efficiency":' . floatval($row['efficiency']); | 289 $recipes .= ',"efficiency":' . floatval($row['efficiency']); |
| 237 $recipes .= ',"est_og":' . floatval($row['est_og']); | 290 $recipes .= ',"est_og":' . floatval($row['est_og']); |
| 238 $recipes .= ',"est_fg":' . floatval($row['est_fg']); | 291 $recipes .= ',"est_fg":' . floatval($row['est_fg']); |
| 239 $recipes .= ',"est_abv":' . floatval($row['est_abv']); | 292 $recipes .= ',"est_abv":' . floatval($row['est_abv']); |
| 240 $recipes .= ',"est_carb":' . floatval($row['est_carb']); | 293 $recipes .= ',"est_carb":' . floatval($row['est_carb']); |
| 241 $recipes .= ',"est_color":' . floatval($row['est_color']); | 294 $recipes .= ',"est_color":' . floatval($row['est_color']); |
| 242 $recipes .= ',"color_method":"' . $row['color_method']; | 295 $recipes .= ',"color_method":' . $row['color_method']; |
| 243 $recipes .= '","est_ibu":' . floatval($row['est_ibu']); | 296 $recipes .= ',"est_ibu":' . floatval($row['est_ibu']); |
| 244 $recipes .= ',"ibu_method":"' . $row['ibu_method']; | 297 $recipes .= ',"ibu_method":' . $row['ibu_method']; |
| 245 $recipes .= '","sparge_temp":' . $row['sparge_temp']; | 298 $recipes .= ',"sparge_temp":' . $row['sparge_temp']; |
| 246 $recipes .= ',"sparge_ph":' . $row['sparge_ph']; | 299 $recipes .= ',"sparge_ph":' . $row['sparge_ph']; |
| 247 $recipes .= ',"sparge_volume":' . $row['sparge_volume']; | 300 $recipes .= ',"sparge_volume":' . $row['sparge_volume']; |
| 248 $recipes .= ',"sparge_source":"' . $row['sparge_source']; | 301 $recipes .= ',"sparge_source":"' . $row['sparge_source']; |
| 249 $recipes .= '","sparge_acid_type":"' . $row['sparge_acid_type']; | 302 $recipes .= '","sparge_acid_type":' . $row['sparge_acid_type']; |
| 250 $recipes .= '","sparge_acid_perc":' . $row['sparge_acid_perc']; | 303 $recipes .= ',"sparge_acid_perc":' . $row['sparge_acid_perc']; |
| 251 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount']; | 304 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount']; |
| 252 $recipes .= ',"mash_ph":' . $row['mash_ph']; | 305 $recipes .= ',"mash_ph":' . $row['mash_ph']; |
| 253 $recipes .= ',"mash_name":"' . $row['mash_name']; | 306 $recipes .= ',"mash_name":"' . $row['mash_name']; |
| 254 $recipes .= '","calc_acid":' . $row['calc_acid']; | 307 $recipes .= '","calc_acid":' . $row['calc_acid']; |
| 255 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); | 308 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); |
| 270 $recipes .= ',"w2_sodium":' . $row['w2_sodium']; | 323 $recipes .= ',"w2_sodium":' . $row['w2_sodium']; |
| 271 $recipes .= ',"w2_magnesium":' . $row['w2_magnesium']; | 324 $recipes .= ',"w2_magnesium":' . $row['w2_magnesium']; |
| 272 $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity']; | 325 $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity']; |
| 273 $recipes .= ',"w2_ph":' . $row['w2_ph']; | 326 $recipes .= ',"w2_ph":' . $row['w2_ph']; |
| 274 $recipes .= ',"w2_cost":' . $row['w2_cost']; | 327 $recipes .= ',"w2_cost":' . $row['w2_cost']; |
| 328 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name']; | |
| 329 $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc']; | |
| 330 $recipes .= ',"wa_base_name":' . $row['wa_base_name']; | |
| 275 $recipes .= ',"fermentables":' . $row['json_fermentables']; | 331 $recipes .= ',"fermentables":' . $row['json_fermentables']; |
| 276 $recipes .= ',"hops":' . $row['json_hops']; | 332 $recipes .= ',"hops":' . $row['json_hops']; |
| 277 $recipes .= ',"miscs":' . $row['json_miscs']; | 333 $recipes .= ',"miscs":' . $row['json_miscs']; |
| 278 $recipes .= ',"yeasts":' . $row['json_yeasts']; | 334 $recipes .= ',"yeasts":' . $row['json_yeasts']; |
| 279 $recipes .= ',"mashs":' . $row['json_mashs']; | 335 $recipes .= ',"mashs":' . $row['json_mashs']; |
