Mercurial > bms / file comparison

comparison: www/includes/db_recipes.php

www/includes/db_recipes.php

changeset 359
98354ef399cd
parent 352
9d2a4703bdac
child 392
544d7d0183b2
equal deleted inserted replaced
358:3be8c2278fd7 359:98354ef399cd
30 $sql .= "uuid='" . $_POST['uuid']; 30 $sql .= "uuid='" . $_POST['uuid'];
31 } else { 31 } else {
32 $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); 32 $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid'));
33 $sql .= "uuid='" . $uuid; 33 $sql .= "uuid='" . $uuid;
34 } 34 }
35 ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0"; 35 $sql .= "', locked='" . $_POST['locked'];
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='" . $_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']);
73 $sql .= "', sparge_acid_type='" . $_POST['sparge_acid_type']; 73 $sql .= "', sparge_acid_type='" . $_POST['sparge_acid_type'];
74 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc']; 74 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc'];
75 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount']; 75 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount'];
76 $sql .= "', mash_ph='" . $_POST['mash_ph']; 76 $sql .= "', mash_ph='" . $_POST['mash_ph'];
77 $sql .= "', mash_name='" . $_POST['mash_name']; 77 $sql .= "', mash_name='" . $_POST['mash_name'];
78 ($_POST['calc_acid'] == 'true') ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0"; 78 $sql .= "', calc_acid='" . $_POST['calc_acid'];
79 if (isset($_POST['w1_name'])) { 79 if (isset($_POST['w1_name'])) {
80 $sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']); 80 $sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']);
81 $sql .= "', w1_amount='" . $_POST['w1_amount']; 81 $sql .= "', w1_amount='" . $_POST['w1_amount'];
82 $sql .= "', w1_calcium='" . $_POST['w1_calcium']; 82 $sql .= "', w1_calcium='" . $_POST['w1_calcium'];
83 $sql .= "', w1_sulfate='" . $_POST['w1_sulfate']; 83 $sql .= "', w1_sulfate='" . $_POST['w1_sulfate'];
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']; 103 $sql .= "', wa_acid_name='" . $_POST['wa_acid_name'];
104 $sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc']; 104 $sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc'];
105 $sql .= "', wa_base_name='" . $_POST['wa_base_name']; 105 $sql .= "', wa_base_name='" . $_POST['wa_base_name'];
106 syslog(LOG_NOTICE, $sql); 106 //syslog(LOG_NOTICE, $sql);
107 107
108 $fermentables = '['; 108 $fermentables = '[';
109 $comma = FALSE; 109 $comma = FALSE;
110 if (isset($_POST['fermentables'])) { 110 if (isset($_POST['fermentables'])) {
111 $array = $_POST['fermentables']; 111 $array = $_POST['fermentables'];
200 200
201 $yeasts = '['; 201 $yeasts = '[';
202 $comma = FALSE; 202 $comma = FALSE;
203 if (isset($_POST['yeasts'])) { 203 if (isset($_POST['yeasts'])) {
204 $array = $_POST['yeasts']; 204 $array = $_POST['yeasts'];
205 syslog(LOG_NOTICE, $_POST['yeasts']);
205 foreach($array as $key => $item) { 206 foreach($array as $key => $item) {
206 if ($comma) 207 if ($comma)
207 $yeasts .= ','; 208 $yeasts .= ',';
208 $comma = TRUE; 209 $comma = TRUE;
209 $yeast = '{"y_name":"' . str_replace($rescapers,$rreplacements,$item['y_name']); 210 $yeast = '{"y_name":"' . str_replace($rescapers,$rreplacements,$item['y_name']);
219 $yeast .= ',"y_cells":' . $item['y_cells']; 220 $yeast .= ',"y_cells":' . $item['y_cells'];
220 $yeast .= ',"y_tolerance":' . $item['y_tolerance']; 221 $yeast .= ',"y_tolerance":' . $item['y_tolerance'];
221 $yeast .= ',"y_inventory":' . $item['y_inventory']; 222 $yeast .= ',"y_inventory":' . $item['y_inventory'];
222 $yeast .= ',"y_use":' . $item['y_use']; 223 $yeast .= ',"y_use":' . $item['y_use'];
223 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; 224 $yeast .= ',"y_cost":' . $item['y_cost'] . '}';
224 //syslog(LOG_NOTICE, $yeast); 225 syslog(LOG_NOTICE, $yeast);
225 $yeasts .= $yeast; 226 $yeasts .= $yeast;
226 } 227 }
227 } 228 }
228 $yeasts .= ']'; 229 $yeasts .= ']';
229 $sql .= "', json_yeasts='" . $yeasts; 230 $sql .= "', json_yeasts='" . $yeasts;
245 $mash .= ',"step_temp":' . $item['step_temp']; 246 $mash .= ',"step_temp":' . $item['step_temp'];
246 $mash .= ',"step_time":' . $item['step_time']; 247 $mash .= ',"step_time":' . $item['step_time'];
247 $mash .= ',"ramp_time":' . $item['ramp_time']; 248 $mash .= ',"ramp_time":' . $item['ramp_time'];
248 $mash .= ',"end_temp":' . $item['end_temp'] . '}'; 249 $mash .= ',"end_temp":' . $item['end_temp'] . '}';
249 $mashs .= $mash; 250 $mashs .= $mash;
250 syslog(LOG_NOTICE, $mash); 251 //syslog(LOG_NOTICE, $mash);
251 } 252 }
252 } 253 }
253 $mashs .= ']'; 254 $mashs .= ']';
254 $sql .= "', json_mashs='" . $mashs; 255 $sql .= "', json_mashs='" . $mashs;
255 256
301 if ($comma) { 302 if ($comma) {
302 $recipes .= ','; 303 $recipes .= ',';
303 } 304 }
304 $comma = TRUE; 305 $comma = TRUE;
305 $recipes .= '{"record":' . $row['record']; 306 $recipes .= '{"record":' . $row['record'];
306 $recipes .= ',"uuid":"' . $row['uuid']; 307 $recipes .= ',"uuid":"' . str_replace($escapers, $replacements, $row['uuid']);
307 $recipes .= '","locked":' . $row['locked']; 308 $recipes .= '","locked":' . $row['locked'];
308 $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']); 309 $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']);
309 $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']); 310 $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']);
310 $recipes .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']); 311 $recipes .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']);
311 $recipes .= '","st_type":' . $row['st_type']; 312 $recipes .= '","st_type":' . $row['st_type'];
336 $recipes .= ',"est_carb":' . floatval($row['est_carb']); 337 $recipes .= ',"est_carb":' . floatval($row['est_carb']);
337 $recipes .= ',"est_color":' . floatval($row['est_color']); 338 $recipes .= ',"est_color":' . floatval($row['est_color']);
338 $recipes .= ',"color_method":' . $row['color_method']; 339 $recipes .= ',"color_method":' . $row['color_method'];
339 $recipes .= ',"est_ibu":' . floatval($row['est_ibu']); 340 $recipes .= ',"est_ibu":' . floatval($row['est_ibu']);
340 $recipes .= ',"ibu_method":' . $row['ibu_method']; 341 $recipes .= ',"ibu_method":' . $row['ibu_method'];
341 $recipes .= ',"sparge_temp":' . $row['sparge_temp']; 342 $recipes .= ',"sparge_temp":' . floatval($row['sparge_temp']);
342 $recipes .= ',"sparge_ph":' . $row['sparge_ph']; 343 $recipes .= ',"sparge_ph":' . floatval($row['sparge_ph']);
343 $recipes .= ',"sparge_volume":' . $row['sparge_volume']; 344 $recipes .= ',"sparge_volume":' . floatval($row['sparge_volume']);
344 $recipes .= ',"sparge_source":"' . $row['sparge_source']; 345 $recipes .= ',"sparge_source":"' . $row['sparge_source'];
345 $recipes .= '","sparge_acid_type":' . $row['sparge_acid_type']; 346 $recipes .= '","sparge_acid_type":' . $row['sparge_acid_type'];
346 $recipes .= ',"sparge_acid_perc":' . $row['sparge_acid_perc']; 347 $recipes .= ',"sparge_acid_perc":' . floatval($row['sparge_acid_perc']);
347 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount']; 348 $recipes .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']);
348 $recipes .= ',"mash_ph":' . $row['mash_ph']; 349 $recipes .= ',"mash_ph":' . floatval($row['mash_ph']);
349 $recipes .= ',"mash_name":"' . $row['mash_name']; 350 $recipes .= ',"mash_name":"' . str_replace($escapers, $replacements, $row['mash_name']);
350 $recipes .= '","calc_acid":' . $row['calc_acid']; 351 $recipes .= '","calc_acid":' . $row['calc_acid'];
351 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); 352 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']);
352 $recipes .= '","w1_amount":' . $row['w1_amount']; 353 $recipes .= '","w1_amount":' . floatval($row['w1_amount']);
353 $recipes .= ',"w1_calcium":' . $row['w1_calcium']; 354 $recipes .= ',"w1_calcium":' . floatval($row['w1_calcium']);
354 $recipes .= ',"w1_sulfate":' . $row['w1_sulfate']; 355 $recipes .= ',"w1_sulfate":' . floatval($row['w1_sulfate']);
355 $recipes .= ',"w1_chloride":' . $row['w1_chloride']; 356 $recipes .= ',"w1_chloride":' . floatval($row['w1_chloride']);
356 $recipes .= ',"w1_sodium":' . $row['w1_sodium']; 357 $recipes .= ',"w1_sodium":' . floatval($row['w1_sodium']);
357 $recipes .= ',"w1_magnesium":' . $row['w1_magnesium']; 358 $recipes .= ',"w1_magnesium":' . floatval($row['w1_magnesium']);
358 $recipes .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity']; 359 $recipes .= ',"w1_total_alkalinity":' . floatval($row['w1_total_alkalinity']);
359 $recipes .= ',"w1_ph":' . $row['w1_ph']; 360 $recipes .= ',"w1_ph":' . floatval($row['w1_ph']);
360 $recipes .= ',"w1_cost":' . $row['w1_cost']; 361 $recipes .= ',"w1_cost":' . floatval($row['w1_cost']);
361 $recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']); 362 $recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']);
362 $recipes .= '","w2_amount":' . $row['w2_amount']; 363 $recipes .= '","w2_amount":' . floatval($row['w2_amount']);
363 $recipes .= ',"w2_calcium":' . $row['w2_calcium']; 364 $recipes .= ',"w2_calcium":' . floatval($row['w2_calcium']);
364 $recipes .= ',"w2_sulfate":' . $row['w2_sulfate']; 365 $recipes .= ',"w2_sulfate":' . floatval($row['w2_sulfate']);
365 $recipes .= ',"w2_chloride":' . $row['w2_chloride']; 366 $recipes .= ',"w2_chloride":' . floatval($row['w2_chloride']);
366 $recipes .= ',"w2_sodium":' . $row['w2_sodium']; 367 $recipes .= ',"w2_sodium":' . floatval($row['w2_sodium']);
367 $recipes .= ',"w2_magnesium":' . $row['w2_magnesium']; 368 $recipes .= ',"w2_magnesium":' . floatval($row['w2_magnesium']);
368 $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity']; 369 $recipes .= ',"w2_total_alkalinity":' . floatval($row['w2_total_alkalinity']);
369 $recipes .= ',"w2_ph":' . $row['w2_ph']; 370 $recipes .= ',"w2_ph":' . floatval($row['w2_ph']);
370 $recipes .= ',"w2_cost":' . $row['w2_cost']; 371 $recipes .= ',"w2_cost":' . floatval($row['w2_cost']);
371 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name']; 372 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name'];
372 $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc']; 373 $recipes .= ',"wa_acid_perc":' . floatval($row['wa_acid_perc']);
373 $recipes .= ',"wa_base_name":' . $row['wa_base_name']; 374 $recipes .= ',"wa_base_name":' . $row['wa_base_name'];
374 if (isset($_GET['record'])) { 375 if (isset($_GET['record'])) {
375 // Append stock information. 376 // Append stock information.
376 $fermentables = json_decode($row['json_fermentables'], true); 377 $fermentables = json_decode($row['json_fermentables'], true);
377 for ($i = 0; $i < count($fermentables); $i++) { 378 for ($i = 0; $i < count($fermentables); $i++) {
427 428
428 $yeasts = json_decode($row['json_yeasts'], true); 429 $yeasts = json_decode($row['json_yeasts'], true);
429 for ($i = 0; $i < count($yeasts); $i++) { 430 for ($i = 0; $i < count($yeasts); $i++) {
430 $yeasts[$i]['y_inventory'] = 0; // Not in stock 431 $yeasts[$i]['y_inventory'] = 0; // Not in stock
431 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db 432 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db
433 if (! isset($yeasts[$i]['y_tolerance']))
434 $yeasts[$i]['y_tolerance'] = 0;
432 $sql2 = "SELECT inventory,tolerance FROM inventory_yeasts "; 435 $sql2 = "SELECT inventory,tolerance FROM inventory_yeasts ";
433 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; 436 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND";
434 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; 437 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND";
435 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; 438 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND";
436 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; 439 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'";

Mercurial Repository: bms

mercurial