diff --git a/eval/dashboard.eval.php b/eval/dashboard.eval.php index ff3ae97d..c1edbb96 100644 --- a/eval/dashboard.eval.php +++ b/eval/dashboard.eval.php @@ -497,6 +497,8 @@ function count_future($arr,$needle,$diff) { $table_assignment_post .= ""; $table_assignment_post .= ""; + $table_assignment_post .= "

Top

"; + // If places have been awarded at the table, but there are duplicates, list them for admins if (($admin) && (!empty($table_places))) { diff --git a/eval/judging_admin.eval.php b/eval/judging_admin.eval.php index a9e94fa3..4954da0c 100644 --- a/eval/judging_admin.eval.php +++ b/eval/judging_admin.eval.php @@ -176,7 +176,7 @@ $eval_place_actions .= ""; if ($mini_bos_count_flag) { $eval_place_actions .= "
"; - $eval_place_actions .= sprintf("%s %s",$mini_bos_alert_css,$mini_bos_alert_icon,$evaluation_info_104); + $eval_place_actions .= sprintf("%s %s Top",$mini_bos_alert_css,$mini_bos_alert_icon,$evaluation_info_104); $eval_place_actions .= "
"; } $eval_place_actions .= ""; diff --git a/eval/judging_dashboard.eval.php b/eval/judging_dashboard.eval.php index 5b97f220..999baaae 100644 --- a/eval/judging_dashboard.eval.php +++ b/eval/judging_dashboard.eval.php @@ -108,9 +108,14 @@ } +// Mini BOS $mini_bos_count_flag = FALSE; $mini_bos_count = 0; $eval_count = 0; +$mini_bos_alert_css = ""; +$mini_bos_alert_icon = ""; +$mini_bos_checked_yes = ""; +$mini_bos_checked_no = ""; foreach ($eval_scores as $key => $value) { @@ -124,6 +129,16 @@ if (($mini_bos_count > 0) && ($eval_count > $mini_bos_count)) $mini_bos_count_flag = TRUE; +if ($mini_bos_count_flag) { + $mini_bos_alert_css = "text-danger"; + $mini_bos_alert_icon = " "; +} + +if ($mini_bos_count == 0) $mini_bos_checked_no = "CHECKED"; +if ($mini_bos_count > 0) { + if ($eval_count == $mini_bos_count) $mini_bos_checked_yes = "CHECKED"; +} + if (($judging_open) && (strpos($row_table_assignments['assignRoles'], "HJ") !== false)) { if ($score_previous_other) { @@ -169,38 +184,29 @@ $actions .= ""; $actions .= ""; - // Mini BOS - $mini_bos_alert_css = ""; - $mini_bos_alert_icon = ""; - $mini_bos_checked = ""; - if ($mini_bos_count_flag) { - $mini_bos_alert_css = "text-danger"; - $mini_bos_alert_icon = " "; - } - - if ($mini_bos_count == $eval_count) $mini_bos_checked = "CHECKED"; + // Mini-BOS $actions .= "
"; - $actions .= "
"; - $actions .= "
"; - $actions .= ""; - if ($mini_bos_count_flag) $actions .= "
".$mini_bos_alert_icon." Not all judges indicated this entry advanced to the mini-BOS round. Please verify and check or uncheck the box above appropriately."; - $actions .= "
"; - $actions .= " "; - $actions .= "
"; + $actions .= "
"; + $actions .= $label_mini_bos; $actions .= "
"; + $actions .= "
"; + $actions .= "
"; + $actions .= ""; + $actions .= ""; + $actions .= "
"; + $actions .= "
"; + $actions .= " "; + $actions .= "
"; + if ($mini_bos_count_flag) { + $actions .= "
"; + $actions .= "".$mini_bos_alert_icon." Not all judges indicated this entry advanced to the mini-BOS round. Please verify and select Yes or No above."; + $actions .= "
"; + } $actions .= "
"; } @@ -293,12 +299,6 @@ $actions .= "
"; } - if (!empty($user_submitted_eval['evalMiniBOS'])) { - $actions .= "
"; - $actions .= " ".$label_mini_bos.""; - $actions .= "
"; - } - if ($judging_open) $notes .= " ".$evaluation_info_006; } @@ -376,7 +376,6 @@ $actions .= $label_view_other_judge_eval; $actions .= " ("; $actions .= $label_score.": ".$score_previous; - if (!empty($value['mini_bos'])) $actions .= " - ".$label_mini_bos; $actions .= ")"; $actions .= ""; $actions .= ""; diff --git a/includes/process.inc.php b/includes/process.inc.php index c9cc5a96..cd9ffc46 100644 --- a/includes/process.inc.php +++ b/includes/process.inc.php @@ -89,19 +89,23 @@ if ($request_method === "POST") { - $token_hash = FALSE; - $token = filter_input(INPUT_POST,'token',FILTER_SANITIZE_STRING); - if (hash_equals($_SESSION['token'],$token)) $token_hash = TRUE; - - if ((!$token) || (!$token_hash) || (!$process_allowed)) { - session_unset(); - session_destroy(); - session_write_close(); - $redirect = $base_url."403.php"; - $redirect = prep_redirect_link($redirect); - $redirect_go_to = sprintf("Location: %s", $redirect); - header($redirect_go_to); - exit(); + if ($action != "paypal") { + + $token_hash = FALSE; + $token = filter_input(INPUT_POST,'token',FILTER_SANITIZE_STRING); + if (hash_equals($_SESSION['token'],$token)) $token_hash = TRUE; + + if ((!$token) || (!$token_hash) || (!$process_allowed)) { + session_unset(); + session_destroy(); + session_write_close(); + $redirect = $base_url."403.php"; + $redirect = prep_redirect_link($redirect); + $redirect_go_to = sprintf("Location: %s", $redirect); + header($redirect_go_to); + exit(); + } + } } diff --git a/index.php b/index.php index 6062c42a..13726bf8 100644 --- a/index.php +++ b/index.php @@ -184,6 +184,8 @@ + +
diff --git a/maintenance.php b/maintenance.php index 08b9afde..9d3d411f 100644 --- a/maintenance.php +++ b/maintenance.php @@ -4,6 +4,14 @@ * Description: This page displays if the site is in maintenance mode. * */ + +// Kill any session that was started. +// Just in case admin puts into maint mode while users are logged in. +if (session_status() !== PHP_SESSION_NONE) { + session_unset(); + session_destroy(); +} + require_once ('paths.php'); require_once (CONFIG.'bootstrap.php'); if (!MAINT) { @@ -13,7 +21,8 @@ exit(); } -$competition_logo = ""; +$competition_logo = ""; +if ((isset($_SESSION['contestLogo'])) && (!empty($_SESSION['contestLogo'])) && (file_exists(USER_IMAGES.$_SESSION['contestLogo']))) $competition_logo = ""; ?> @@ -22,7 +31,7 @@ - <?php echo $maintenance_text_001; ?> + <?php echo $label_maintenance." – ".ucwords($maintenance_text_001); ?>
-

+

-
+
- +
-

+

-
+ + \ No newline at end of file diff --git a/output/styles.output.php b/output/styles.output.php index 00b0c51a..d2e8054b 100644 --- a/output/styles.output.php +++ b/output/styles.output.php @@ -2,7 +2,7 @@ $section = "styles"; include (DB.'styles.db.php'); ?> -
+

Accepted Styles

diff --git a/sections/brewer_entries.sec.php b/sections/brewer_entries.sec.php index b3355548..6f57ab40 100644 --- a/sections/brewer_entries.sec.php +++ b/sections/brewer_entries.sec.php @@ -279,7 +279,7 @@ else $entry_output .= "
".$label_confirmed." "; if ($row_log['brewPaid'] == 0) $entry_output .= "
".$label_paid." "; else $entry_output .= "
".$label_paid." "; - if ($row_log['brewReceived'] == 0) $entry_output .= "
".$label_received.""; + if ($row_log['brewReceived'] == 0) $entry_output .= "
".$label_received." "; else $entry_output .= "
".$label_received." "; } diff --git a/setup/install_db.setup.php b/setup/install_db.setup.php index 80f4ee18..e7b6a33e 100644 --- a/setup/install_db.setup.php +++ b/setup/install_db.setup.php @@ -242,6 +242,7 @@ $output .= "
  • The Contacts table was NOT installed successfully.
    • "; } else $output .= "
  • The Contacts table was installed successfully.
    • "; + /** * -------------------------------------- * Competition Info Table @@ -298,6 +299,63 @@ } else $output .= "
  • The Competition Info table was installed successfully.
    • "; + $contestRules = array( + "competition_rules" => "

    Placeholder

    ", + "competition_packing_shipping" => "

    Placeholder

    " + ); + + $contestRules = json_encode($contestRules); + + $update_table = $prefix."contest_info"; + $data = array( + 'id' => 1, + 'contestName' => 'Install Placeholder', + 'contestHost' => 'BCOEM', + 'contestHostWebsite' => 'http://www.brewcompetition.com', + 'contestHostLocation' => 'Denver, CO', + 'contestRegistrationOpen' => '1438322400', + 'contestRegistrationDeadline' => '1483253940', + 'contestEntryOpen' => '1438322400', + 'contestEntryDeadline' => '1483253940', + 'contestJudgeOpen' => '1438322400', + 'contestJudgeDeadline' => '1483253940', + 'contestRules' => $contestRules, + 'contestAwardsLocation' => '200 E Colfax Ave, Denver, CO 80203', + 'contestAwardsLocName' => NULL, + 'contestAwardsLocDate' => NULL, + 'contestAwardsLocTime' => NULL, + 'contestShippingOpen' => NULL, + 'contestShippingDeadline' => NULL, + 'contestEntryFee' => '8.00', + 'contestEntryFee2' => NULL, + 'contestEntryFeeDiscount' => 'N', + 'contestEntryFeeDiscountNum' => NULL, + 'contestDropoffOpen' => '1438322400', + 'contestBottles' => '

    Placeholder

    ', + 'contestShippingAddress' => '200 E Colfax Ave, Denver, CO 80203', + 'contestShippingName' => 'Shipping Location', + 'contestAwards' => '

    Placeholder

    ', + 'contestLogo' => NULL, + 'contestBOSAward' => NULL, + 'contestDropoffDeadline' => '1483253940', + 'contestEntryCap' => NULL, + 'contestEntryFeePassword' => NULL, + 'contestEntryFeePasswordNum' => NULL, + 'contestID' => '000000', + 'contestCircuit' => NULL, + 'contestVolunteers' => '

    Placeholder

    ', + 'contestCheckInPassword' => NULL, + ); + + $result = $db_conn->update ($update_table, $data); + if (!$result) { + $error_output[] = $db_conn->getLastError(); + $errors = TRUE; + $output .= "
  • Competition Info placeholder data was NOT added successfully.
    • "; + } + + else $output .= "
  • Competition Info placeholder data was added successfully.
    • "; + /** * -------------------------------------- * Drop-Off Table @@ -640,6 +698,86 @@ } else $output .= "
  • The Preferences table was installed successfully.
    • "; + $update_table = $prefix."preferences"; + $data = array( + 'id' => '1', + 'prefsTemp' => 'Fahrenheit', + 'prefsWeight1' => 'ounces', + 'prefsWeight2' => 'pounds', + 'prefsLiquid1' => 'ounces', + 'prefsLiquid2' => 'gallons', + 'prefsPaypal' => 'N', + 'prefsPaypalAccount' => NULL, + 'prefsPaypalIPN' => '0', + 'prefsCurrency' => '$', + 'prefsCash' => 'N', + 'prefsCheck' => 'N', + 'prefsCheckPayee' => NULL, + 'prefsTransFee' => 'Y', + 'prefsGoogleAccount' => '|', + 'prefsSponsors' => 'N', + 'prefsSponsorLogos' => 'N', + 'prefsSponsorLogoSize' => '250', + 'prefsCompLogoSize' => '300', + 'prefsDisplayWinners' => 'Y', + 'prefsWinnerDelay' => '1616974200', + 'prefsWinnerMethod' => '0', + 'prefsDisplaySpecial' => 'J', + 'prefsBOSMead' => 'N', + 'prefsBOSCider' => 'N', + 'prefsEntryForm' => '5', + 'prefsRecordLimit' => '9999', + 'prefsRecordPaging' => '150', + 'prefsProEdition' => '0', + 'prefsTheme' => 'bruxellensis', + 'prefsDateFormat' => '1', + 'prefsContact' => 'Y', + 'prefsTimeZone' => '-7.001', + 'prefsEntryLimit' => NULL, + 'prefsTimeFormat' => '0', + 'prefsUserEntryLimit' => NULL, + 'prefsUserSubCatLimit' => NULL, + 'prefsUSCLEx' => NULL, + 'prefsUSCLExLimit' => NULL, + 'prefsPayToPrint' => 'N', + 'prefsHideRecipe' => 'Y', + 'prefsUseMods' => 'N', + 'prefsSEF' => 'N', + 'prefsSpecialCharLimit' => '200', + 'prefsStyleSet' => 'BJCP2021', + 'prefsAutoPurge' => '0', + 'prefsEntryLimitPaid' => NULL, + 'prefsEmailRegConfirm' => '0', + 'prefsShipping' => '1', + 'prefsDropOff' => '1', + 'prefsLanguage' => 'en-US', + 'prefsSpecific' => '1', + 'prefsShowBestBrewer' => '0', + 'prefsBestBrewerTitle' => NULL, + 'prefsFirstPlacePts' => '0', + 'prefsSecondPlacePts' => '0', + 'prefsThirdPlacePts' => '0', + 'prefsFourthPlacePts' => '0', + 'prefsHMPts' => '0', + 'prefsTieBreakRule1' => NULL, + 'prefsTieBreakRule2' => NULL, + 'prefsTieBreakRule3' => NULL, + 'prefsTieBreakRule4' => NULL, + 'prefsTieBreakRule5' => NULL, + 'prefsTieBreakRule6' => NULL, + 'prefsShowBestClub' => '0', + 'prefsBestClubTitle' => NULL, + 'prefsCAPTCHA' => '0' + ); + $result = $db_conn->insert ($update_table, $data); + if (!$result) { + $error_output[] = $db_conn->getLastError(); + $errors = TRUE; + $output .= "
  • Preferences placeholder data was NOT added successfully.
    • "; + } + + else $output .= "
  • Preferences placeholder data was added successfully.
    • "; + // ------------------- // Special Best Data Table // ------------------- diff --git a/site/bootstrap.php b/site/bootstrap.php index cabd0700..c4631c79 100644 --- a/site/bootstrap.php +++ b/site/bootstrap.php @@ -243,7 +243,6 @@ 'prefsCheck' => 'N', 'prefsCheckPayee' => NULL, 'prefsTransFee' => 'Y', - 'prefsGoogle' => NULL, 'prefsGoogleAccount' => '|', 'prefsSponsors' => 'N', 'prefsSponsorLogos' => 'N',