diff -r 03e81378182d -r a85c1d4c4d12 www/includes/db_product.php --- a/www/includes/db_product.php Sun Feb 03 23:21:55 2019 +0100 +++ b/www/includes/db_product.php Mon Feb 04 15:21:49 2019 +0100 @@ -69,68 +69,83 @@ $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume']; $sql .= "', eq_mash_max='" . $_POST['eq_mash_max']; $sql .= "', eq_efficiency='" . $_POST['eq_efficiency']; - $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"; + + if ($stage > 1) { + $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']; - $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']; - $sql .= "', package_date='" . $_POST['package_date']; - $sql .= "', bottle_amount='" . $_POST['bottle_amount']; - $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; - $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar']; - $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount']; - $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp']; - $sql .= "', keg_amount='" . $_POST['keg_amount']; - $sql .= "', keg_carbonation='" . $_POST['keg_carbonation']; - $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar']; - $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount']; - $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp']; - ($_POST['keg_forced_carb'] == 'true') ? $sql .= "', keg_forced_carb='1" : $sql .= "', keg_forced_carb='0"; - $sql .= "', keg_pressure='" . $_POST['keg_pressure']; - $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']); - $sql .= "', taste_rate='" . $_POST['taste_rate']; - $sql .= "', taste_date='" . $_POST['taste_date']; - $sql .= "', taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']); - $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']); - $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']); - $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']); - $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']); - $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']); - $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']); + + if ($stage > 2) { + $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']; + } + + if ($stage > 3) { + $sql .= "', secondary_temp='" . $_POST['secondary_temp']; + $sql .= "', secondary_end_date='" . $_POST['secondary_end_date']; + $sql .= "', tertiary_temp='" . $_POST['tertiary_temp']; + } + + if ($stage > 4) { + $sql .= "', package_date='" . $_POST['package_date']; + $sql .= "', bottle_amount='" . $_POST['bottle_amount']; + $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; + $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar']; + $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount']; + $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp']; + $sql .= "', keg_amount='" . $_POST['keg_amount']; + $sql .= "', keg_carbonation='" . $_POST['keg_carbonation']; + $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar']; + $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount']; + $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp']; + ($_POST['keg_forced_carb'] == 'true') ? $sql .= "', keg_forced_carb='1" : $sql .= "', keg_forced_carb='0"; + $sql .= "', keg_pressure='" . $_POST['keg_pressure']; + } + + if ($stage > 8) { + $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']); + $sql .= "', taste_rate='" . $_POST['taste_rate']; + $sql .= "', taste_date='" . $_POST['taste_date']; + $sql .= "', taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']); + $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']); + $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']); + $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']); + $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']); + $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']); + $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']); + } /* * Recipe part