diff -r 4a4cc3497a57 -r 0a5abea575a9 www/includes/db_product.php --- a/www/includes/db_product.php Wed Jan 02 14:49:17 2019 +0100 +++ b/www/includes/db_product.php Wed Jan 02 17:34:53 2019 +0100 @@ -56,7 +56,7 @@ $sql .= "', code='" . mysqli_real_escape_string($connect, $_POST['code']); $sql .= "', birth='" . $_POST['birth']; $sql .= "', stage='" . $_POST['stage']; -// $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']); + $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']); ($_POST['log_brew'] == 'true') ? $sql .= "', log_brew='1" : $sql .= "', log_brew='0"; ($_POST['log_fermentation'] == 'true') ? $sql .= "', log_fermentation='1" : $sql .= "', log_fermentation='0"; ($_POST['inventory_reduced'] == 'true') ? $sql .= "', inventory_reduced='1" : $sql .= "', inventory_reduced='0"; @@ -77,7 +77,7 @@ $sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume']; $sql .= "', eq_top_up_kettle='" . $_POST['eq_top_up_kettle']; $sql .= "', eq_hop_utilization='" . $_POST['eq_hop_utilization']; -// $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']); + $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']); $sql .= "', eq_lauter_volume='" . $_POST['eq_lauter_volume']; $sql .= "', eq_lauter_height='" . $_POST['eq_lauter_height']; $sql .= "', eq_lauter_deadspace='" . $_POST['eq_lauter_deadspace']; @@ -86,49 +86,42 @@ $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; - - if ($stageno >= 2) { - // brew_date_start - // brew_mash_ph - // brew_mash_sg - // brew_sparge_temperature - // brew_sparge_volume - // brew_sparge_ph - // brew_preboil_volume - // brew_preboil_sg - // brew_preboil_ph - // brew_aboil_volume - // brew_aboil_sg - // brew_aboil_ph - // brew_aboil_efficiency - // brew_cooling_method - // brew_cooling_time - // brew_cooling_to - // brew_whirlpool9 - // brew_whirlpool7 - // brew_whirlpool6 - // brew_whirlpool2 - // brew_fermenter_volume - // brew_fermenter_extrawater - // brew_aeration_time - // brew_aeration_speed - // brew_aeration_type - // brew_fermenter_sg - // brew_fermenter_ibu - // brew_date_end - // brew_log_available - } + $sql .= "', brew_date_start='" . $_POST['brew_date_start']; + $sql .= "', brew_mash_ph='" . $_POST['brew_mash_ph']; + $sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg']; + $sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature']; + $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume']; + $sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph']; + $sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume']; + $sql .= "', brew_preboil_sg='" . $_POST['brew_preboil_sg']; + $sql .= "', brew_preboil_ph='" . $_POST['brew_preboil_ph']; + $sql .= "', brew_aboil_volume='" . $_POST['brew_aboil_volume']; + $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg']; + $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph']; + $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency']; + $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method']; + $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time']; + $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to']; + $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9']; + $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7']; + $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6']; + $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2']; + $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time']; + $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed']; + $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type']; + $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume']; + $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater']; + $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg']; + $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu']; + $sql .= "', brew_date_end='" . $_POST['brew_date_end']; + ($_POST['brew_log_available'] == 'true') ? $sql .= "', brew_log_available='1" : $sql .= "', brew_log_available='0"; $sql .= "', og='" . $_POST['og']; $sql .= "', fg='" . $_POST['fg']; - - if ($stageno >= 3) { - // primary_start_temp - // primary_max_temp - // primary_end_temp - // primary_end_sg - // primary_end_date - } - + $sql .= "', primary_start_temp='" . $_POST['primary_start_temp']; + $sql .= "', primary_max_temp='" . $_POST['primary_max_temp']; + $sql .= "', primary_end_temp='" . $_POST['primary_end_temp']; + $sql .= "', primary_end_sg='" . $_POST['primary_end_sg']; + $sql .= "', primary_end_date='" . $_POST['primary_end_date']; $sql .= "', secondary_temp='" . $_POST['secondary_temp']; $sql .= "', secondary_end_date='" . $_POST['secondary_end_date']; $sql .= "', tertiary_temp='" . $_POST['tertiary_temp']; @@ -233,7 +226,7 @@ unset($array[$key]["$disallowed_key"]); } } - syslog(LOG_NOTICE, "json_fermentables=: ".str_replace($rescapers,$rreplacements,json_encode($array))); +// syslog(LOG_NOTICE, "json_fermentables=: ".str_replace($rescapers,$rreplacements,json_encode($array))); $sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,json_encode($array)); } @@ -244,7 +237,7 @@ unset($array[$key]["$disallowed_key"]); } } - syslog(LOG_NOTICE, "json_hops: ".str_replace($rescapers,$rreplacements,json_encode($array))); +// syslog(LOG_NOTICE, "json_hops: ".str_replace($rescapers,$rreplacements,json_encode($array))); $sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,json_encode($array)); } @@ -255,7 +248,7 @@ unset($array[$key]["$disallowed_key"]); } } - syslog(LOG_NOTICE, "json_miscs: ".str_replace($rescapers,$rreplacements,json_encode($array))); +// syslog(LOG_NOTICE, "json_miscs: ".str_replace($rescapers,$rreplacements,json_encode($array))); $sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,json_encode($array)); } @@ -266,7 +259,7 @@ unset($array[$key]["$disallowed_key"]); } } - syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array))); +// syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array))); $sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array)); } @@ -277,7 +270,7 @@ unset($array[$key]["$disallowed_key"]); } } - syslog(LOG_NOTICE, "json_mashs: ".str_replace($rescapers,$rreplacements,json_encode($array))); +// syslog(LOG_NOTICE, "json_mashs: ".str_replace($rescapers,$rreplacements,json_encode($array))); $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($array)); }