comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 222
- 78946739b3a6
- parent 221
- a8aabb63fbcc
- child 223
- 0de4455bd2a1
equal
deleted
inserted
replaced
| 221:a8aabb63fbcc | 222:78946739b3a6 |
|---|---|
| 333 $fermentables = json_decode($row['json_fermentables'], true); | 333 $fermentables = json_decode($row['json_fermentables'], true); |
| 334 for ($i = 0; $i < count($fermentables); $i++) { | 334 for ($i = 0; $i < count($fermentables); $i++) { |
| 335 $fermentables[$i]['f_inventory'] = 0; // Not in stock | 335 $fermentables[$i]['f_inventory'] = 0; // Not in stock |
| 336 $fermentables[$i]['f_avail'] = 0; // Ingredient not in db | 336 $fermentables[$i]['f_avail'] = 0; // Ingredient not in db |
| 337 $sql2 = "SELECT inventory FROM inventory_fermentables "; | 337 $sql2 = "SELECT inventory FROM inventory_fermentables "; |
| 338 $sql2 .= "WHERE name='".$fermentables[$i]['f_name']."' AND supplier='".$fermentables[$i]['f_supplier']."'"; | 338 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $fermentables[$i]['f_name'])."' AND"; |
| 339 $sql2 .= " supplier='".str_replace($rescapers, $rreplacements, $fermentables[$i]['f_supplier'])."'"; | |
| 339 if ($result2 = mysqli_query($connect, $sql2)) { | 340 if ($result2 = mysqli_query($connect, $sql2)) { |
| 340 if ($obj = mysqli_fetch_object($result2)) { | 341 if ($obj = mysqli_fetch_object($result2)) { |
| 341 $fermentables[$i]['f_inventory'] = $obj->inventory; | 342 $fermentables[$i]['f_inventory'] = floatval($obj->inventory); |
| 342 $fermentables[$i]['f_avail'] = 1; | 343 $fermentables[$i]['f_avail'] = 1; |
| 343 } | 344 } |
| 344 mysqli_free_result($result2); | 345 mysqli_free_result($result2); |
| 345 } | 346 } |
| 346 } | 347 } |
| 347 syslog(LOG_NOTICE, json_encode($fermentables, JSON_UNESCAPED_UNICODE)); | |
| 348 $recipes .= ',"fermentables":' . json_encode($fermentables, JSON_UNESCAPED_UNICODE); | 348 $recipes .= ',"fermentables":' . json_encode($fermentables, JSON_UNESCAPED_UNICODE); |
| 349 $recipes .= ',"hops":' . $row['json_hops']; | 349 |
| 350 $recipes .= ',"miscs":' . $row['json_miscs']; | 350 $hops = json_decode($row['json_hops'], true); |
| 351 $recipes .= ',"yeasts":' . $row['json_yeasts']; | 351 for ($i = 0; $i < count($hops); $i++) { |
| 352 $hops[$i]['h_inventory'] = 0; // Not in stock | |
| 353 $hops[$i]['h_avail'] = 0; // Ingredient not in db | |
| 354 $sql2 = "SELECT inventory FROM inventory_hops "; | |
| 355 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $hops[$i]['h_name'])."' AND"; | |
| 356 $sql2 .= " origin='".str_replace($rescapers, $rreplacements, $hops[$i]['h_origin'])."' AND"; | |
| 357 $sql2 .= " form='".$hops[$i]['h_form']."'"; | |
| 358 if ($result2 = mysqli_query($connect, $sql2)) { | |
| 359 if ($obj = mysqli_fetch_object($result2)) { | |
| 360 $hops[$i]['h_inventory'] = floatval($obj->inventory); | |
| 361 $hops[$i]['h_avail'] = 1; | |
| 362 } | |
| 363 mysqli_free_result($result2); | |
| 364 } | |
| 365 } | |
| 366 // syslog(LOG_NOTICE, json_encode($hops, JSON_UNESCAPED_UNICODE)); | |
| 367 $recipes .= ',"hops":' . json_encode($hops, JSON_UNESCAPED_UNICODE); | |
| 368 | |
| 369 $miscs = json_decode($row['json_miscs'], true); | |
| 370 for ($i = 0; $i < count($miscs); $i++) { | |
| 371 $miscs[$i]['m_inventory'] = 0; // Not in stock | |
| 372 $miscs[$i]['m_avail'] = 0; // Ingredient not in db | |
| 373 $sql2 = "SELECT inventory FROM inventory_miscs "; | |
| 374 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $miscs[$i]['m_name'])."' AND"; | |
| 375 $sql2 .= " type='".$miscs[$i]['m_type']."'"; | |
| 376 if ($result2 = mysqli_query($connect, $sql2)) { | |
| 377 if ($obj = mysqli_fetch_object($result2)) { | |
| 378 $miscs[$i]['m_inventory'] = floatval($obj->inventory); | |
| 379 $miscs[$i]['m_avail'] = 1; | |
| 380 } | |
| 381 mysqli_free_result($result2); | |
| 382 } | |
| 383 } | |
| 384 // syslog(LOG_NOTICE, json_encode($miscs, JSON_UNESCAPED_UNICODE)); | |
| 385 $recipes .= ',"miscs":' . json_encode($miscs, JSON_UNESCAPED_UNICODE); | |
| 386 | |
| 387 $yeasts = json_decode($row['json_yeasts'], true); | |
| 388 for ($i = 0; $i < count($yeasts); $i++) { | |
| 389 $yeasts[$i]['y_inventory'] = 0; // Not in stock | |
| 390 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db | |
| 391 $sql2 = "SELECT inventory FROM inventory_yeasts "; | |
| 392 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; | |
| 393 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; | |
| 394 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; | |
| 395 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; | |
| 396 // syslog(LOG_NOTICE, $sql2); | |
| 397 if ($result2 = mysqli_query($connect, $sql2)) { | |
| 398 if ($obj = mysqli_fetch_object($result2)) { | |
| 399 $yeasts[$i]['y_inventory'] = floatval($obj->inventory); | |
| 400 $yeasts[$i]['y_avail'] = 1; | |
| 401 } | |
| 402 mysqli_free_result($result2); | |
| 403 } | |
| 404 } | |
| 405 // syslog(LOG_NOTICE, json_encode($yeasts, JSON_UNESCAPED_UNICODE)); | |
| 406 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); | |
| 352 } else { | 407 } else { |
| 353 // Just leave it. | 408 // Just leave it. |
| 354 $recipes .= ',"fermentables":' . $row['json_fermentables']; | 409 $recipes .= ',"fermentables":' . $row['json_fermentables']; |
| 355 $recipes .= ',"hops":' . $row['json_hops']; | 410 $recipes .= ',"hops":' . $row['json_hops']; |
| 356 $recipes .= ',"miscs":' . $row['json_miscs']; | 411 $recipes .= ',"miscs":' . $row['json_miscs']; |
