Fix PayPal IPN Error

geoffhumphrey · Sep 25, 2023 · 27342ca · 27342ca
1 parent 0fc6a2b
commit 27342ca
Show file tree

Hide file tree

Showing 10 changed files with 215 additions and 62 deletions.
diff --git a/eval/dashboard.eval.php b/eval/dashboard.eval.php
@@ -497,6 +497,8 @@ function count_future($arr,$needle,$diff) {
 			$table_assignment_post .= "</tbody>";
 			$table_assignment_post .= "</table>";
 
+			$table_assignment_post .= "<p><a href=\"#top\"><i class=\"fa fa-sm fa-arrow-circle-up\"></i> Top</a></p>";
+
 			// 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
@@ -176,7 +176,7 @@
    	$eval_place_actions .= "</div>";
 	if ($mini_bos_count_flag) {
 		$eval_place_actions .= "<div id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-hide\" style=\"margin-bottom:5px;\" class=\"col col-sm-12\">";
-		$eval_place_actions .= sprintf("<span class=\"small %s\">%s %s</span>",$mini_bos_alert_css,$mini_bos_alert_icon,$evaluation_info_104);
+		$eval_place_actions .= sprintf("<span class=\"small %s\">%s %s</span> <a class=\"small\" href=\"#top\"><i class=\"fa fa-sm fa-arrow-circle-up\"></i> Top</a>",$mini_bos_alert_css,$mini_bos_alert_icon,$evaluation_info_104);
 		$eval_place_actions .= "</div>";
 	}
 	$eval_place_actions .= "</div>";

diff --git 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 = " <i class=\"fa fa-exclamation-triangle\"></i>";
+}
+
+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 .= "</div>";
 		$actions .= "</div>";
 
-		// 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 = " <i class=\"fa fa-exclamation-triangle\"></i>";
-		}
-
-		if ($mini_bos_count == $eval_count) $mini_bos_checked = "CHECKED";
 
+		// Mini-BOS
 		$actions .= "<div class=\"row\">";
-		$actions .= "<div class=\"col col-sm-12\">";
-		$actions .= "<div class=\"checkbox\" style=\"margin-bottom:5px;\" id=\"eval-mbos-ajax-".$row_entries['id']."-evalPlace-form-group\">";
-		$actions .= "<label><input type=\"checkbox\" name=\"evalMiniBOS\" value=\"1\"".$mini_bos_checked." onclick=\"
-		save_column(
-		'".$base_url."',
-		'evalMiniBOS',
-		'evaluation',
-		'".$row_entries['id']."',
-		'eval-mini-bos-".$row_entries['id']."',
-		'default',
-		'default',
-		'default',
-		'eval-mbos-ajax-".$row_entries['id']."',
-		'value'
-	)\"> ".$evaluation_info_054."</label>";
-		if ($mini_bos_count_flag) $actions .= "<br><span class=\"small ".$mini_bos_alert_css."\">".$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.</span>";
-		$actions .= "<br><span style=\"margin-left:5px;\" id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-status\"></span> ";
-		$actions .= "<span id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-status-msg\"></span> ";
-        $actions .= "</div>";
+		$actions .= "<div class=\"col col-lg-6 col-md-7 col-sm-12 ".$mini_bos_alert_css."\">";
+		$actions .= $label_mini_bos;
 		$actions .= "</div>";
+		$actions .= "<div style=\"margin-bottom:5px;\" class=\"col col-lg-6 col-md-5 col-sm-12\">";
+		$actions .= "<div class=\"input-group\">";
+		$actions .= "<label class=\"radio-inline ".$mini_bos_alert_css."\">";
+		$actions .= "<input type=\"radio\" name=\"evalMiniBOS".$row_entries['id']."\" value=\"1\" onclick=\"save_column('".$base_url."','evalMiniBOS','evaluation','".$row_entries['id']."','1','default','default','default','eval-mbos-ajax-".$row_entries['id']."','value')\" ".$mini_bos_checked_yes.">Yes";
+		$actions .= "</label>";
+		$actions .= "<label class=\"radio-inline ".$mini_bos_alert_css."\">";
+		$actions .= "<input type=\"radio\" name=\"evalMiniBOS".$row_entries['id']."\" value=\"0\" onclick=\"save_column('".$base_url."','evalMiniBOS','evaluation','".$row_entries['id']."','0','default','default','default','eval-mbos-ajax-".$row_entries['id']."','value')\" ".$mini_bos_checked_no.">No";
+		$actions .= "</label>";
+		$actions .= "</div>";
+		$actions .= "<br><span id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-status\"></span> ";
+		$actions .= "<span id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-status-msg\"></span> ";
+       	$actions .= "</div>";
+		if ($mini_bos_count_flag) {
+			$actions .= "<div id=\"eval-mbos-ajax-".$row_entries['id']."-evalMiniBOS-hide\" style=\"margin-bottom:5px;\" class=\"col col-sm-12\">";
+			$actions .= "<span class=\"small ".$mini_bos_alert_css."\">".$mini_bos_alert_icon." Not all judges indicated this entry advanced to the mini-BOS round. Please verify and select Yes or No above.</span>";
+			$actions .= "</div>";
+		}
 		$actions .= "</div>";
 
 	}
@@ -293,12 +299,6 @@
 		$actions .= "</div>";
 	}
 
-	if (!empty($user_submitted_eval['evalMiniBOS'])) {
-		$actions .= "<div class=\"text-center\">";
-		$actions .= "<small><i class=\"fa fa-check-square-o\"></i> ".$label_mini_bos."</small>";
-		$actions .= "</div>";
-	}
-
 	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 .= "</a>";
 				$actions .= "</div>";

diff --git 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
@@ -184,6 +184,8 @@
 </head>
 <body>
 
+<a name="top"></a>
+
 <!-- LOADER -->
 <div id="loader-submit">
     <div class="center">

diff --git 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 = "<img src=\"".$base_url."user_images/".$_SESSION['contestLogo']."\" class=\"bcoem-comp-logo img-responsive hidden-print center-block\" alt=\"Competition Logo\" title=\"Competition Logo\" />";
+$competition_logo = "";
+if ((isset($_SESSION['contestLogo'])) && (!empty($_SESSION['contestLogo'])) && (file_exists(USER_IMAGES.$_SESSION['contestLogo']))) $competition_logo = "<img src=\"".$base_url."user_images/".$_SESSION['contestLogo']."\" class=\"bcoem-comp-logo img-responsive hidden-print center-block\" alt=\"Competition Logo\" title=\"Competition Logo\" />";
 ?>
 
 <!DOCTYPE html>
@@ -22,7 +31,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title><?php echo $maintenance_text_001; ?></title>
+    <title><?php echo $label_maintenance." &ndash; ".ucwords($maintenance_text_001); ?></title>
 
     <?php
     if (CDN) include (INCLUDES.'load_cdn_libraries.inc.php');
@@ -41,29 +50,29 @@
         <div class="navbar navbar-default navbar-fixed-top">
             <div class="container">
                 <div class="navbar-header">
-                    <p class="navbar-text col-md-12 col-sm-12 col-xs-12"><i class="fa fa-lg fa-wrench"></i> <i class="fa fa-lg fa-cog fa-spin"></i></p>
+                    <p class="navbar-text col-md-12 col-sm-12 col-xs-12"><i class="fa fa-lg fa-wrench"></i> <i class="fa fa-lg fa-cog"></i></p>
                 </div>
-            </div><!--/.nav-collapse -->
+            </div>
         </div>
-    </div><!-- container -->
+    </div>
     <!-- ./MAIN NAV -->
     <!-- Container -->
     <div class="jumbotron">
     	<div class="container">
             <div class="row">
                 <div class="col col-xs-12 col-sm-7 col-md-9">
-                    <h1><i class="fa fa-lg fa-cog"></i> <?php echo $label_maintenance; ?></h1>
+                    <h1><i class="fa fa-lg fa-cog fa-spin"></i> <?php echo $label_maintenance; ?></h1>
                     <p class="lead"><?php echo $maintenance_text_000; ?></p>
                 </div>
                 <div class="col col-sm-5 col-md-3 hidden-xs">
-                    <?php if ((isset($_SESSION['contestLogo'])) && (!empty($_SESSION['contestLogo'])) && (file_exists(USER_IMAGES.$_SESSION['contestLogo']))) echo $competition_logo; ?>
+                    <?php echo $competition_logo; ?>
                 </div>
             </div>
         </div>
     </div>
     <div class="container">
     	<p><?php echo $maintenance_text_001; ?></p>
-    </div><!-- ./container -->
+    </div>
     <!-- ./Container -->
     <!-- Footer -->
     <footer class="footer">
@@ -72,7 +81,7 @@
                 <p class="navbar-text col-md-12 col-sm-12 col-xs-12 text-muted small"><?php include (SECTIONS.'footer.sec.php'); ?></p>
             </div>
     	</nav>
-    </footer><!-- ./footer -->
+    </footer>
 	<!-- ./ Footer -->
 </body>
 </html>
diff --git a/output/styles.output.php b/output/styles.output.php
@@ -2,7 +2,7 @@
 $section = "styles";
 include (DB.'styles.db.php');
 ?>
-    <div class="page-header"><a name="top"></a>
+    <div class="page-header">
     <?php if ($go == "default") { ?>
     <h1>Accepted <?php echo str_replace("2"," 2",$row_styles['brewStyleVersion']); ?> Styles</h1>
     <?php } else { ?>

diff --git a/sections/brewer_entries.sec.php b/sections/brewer_entries.sec.php
@@ -279,7 +279,7 @@
 			else $entry_output .= "<br><span class=\"text-success\">".$label_confirmed." <i class=\"fa fa-fw fa-check\"></i></span>";
 			if ($row_log['brewPaid'] == 0) $entry_output .= "<br><span class=\"text-danger\">".$label_paid." <i class=\"fa fa-sm fa-fw fa-times\"></i></span>";
 			else $entry_output .= "<br><span class=\"text-success\">".$label_paid." <i class=\"fa fa-sm fa-fw fa-check\"></i></span>";
-			if ($row_log['brewReceived'] == 0) $entry_output .= "<br><span class=\"text-danger\">".$label_received."</span>";
+			if ($row_log['brewReceived'] == 0) $entry_output .= "<br><span class=\"text-danger\">".$label_received." <i class=\"fa fa-sm fa-fw fa-times\"></i></span>";
 			else $entry_output .= "<br><span class=\"text-success\">".$label_received." <i class=\"fa fa-sm fa-fw fa-check\"></i></span>";
 		}