More DRY auto submit feature, and fix boolean flag argument.

Single Responsibility Principle (SRP).
pronamic · Oct 4, 2023 · 7fdbf69 · 7fdbf69
1 parent fb9946b
commit 7fdbf69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/Core/Gateway.php b/src/Core/Gateway.php
@@ -306,7 +306,7 @@ public function redirect_via_http( Payment $payment ) {
 	 */
 	public function redirect_via_html( Payment $payment ) {
 		if ( headers_sent() ) {
-			echo $this->get_form_html( $payment, true );
+			echo $this->get_form_html( $payment );
 		} else {
 			Core_Util::no_cache();
 
@@ -319,12 +319,11 @@ public function redirect_via_html( Payment $payment ) {
 	/**
 	 * Get form HTML.
 	 *
-	 * @param Payment $payment     Payment to get form HTML for.
-	 * @param bool    $auto_submit Flag to auto submit.
+	 * @param Payment $payment Payment to get form HTML for.
 	 * @return string
 	 * @throws \Exception When payment action URL is empty.
 	 */
-	public function get_form_html( Payment $payment, $auto_submit = false ) {
+	public function get_form_html( Payment $payment ) {
 		$form_inner = $this->get_output_html( $payment );
 
 		$form_inner .= sprintf(
@@ -344,6 +343,12 @@ public function get_form_html( Payment $payment, $auto_submit = false ) {
 			$form_inner
 		);
 
+		$auto_submit = true;
+
+		if ( defined( '\PRONAMIC_PAY_DEBUG' ) && \PRONAMIC_PAY_DEBUG ) {
+			$auto_submit = true;
+		}
+
 		if ( $auto_submit ) {
 			$element = new Element(
 				'script',

diff --git a/views/redirect-via-html.php b/views/redirect-via-html.php
@@ -31,19 +31,7 @@
 		</script>
 	</head>
 
-	<?php
-
-	$auto_submit = true;
-
-	if ( defined( '\PRONAMIC_PAY_DEBUG' ) && \PRONAMIC_PAY_DEBUG ) {
-		$auto_submit = false;
-	}
-
-	$onload = $auto_submit ? 'document.forms[0].submit();' : '';
-
-	?>
-
-	<body onload="<?php esc_attr( $onload ); ?>">
+	<body>
 		<div class="pronamic-pay-redirect-page">
 			<div class="pronamic-pay-redirect-container">
 				<h1><?php esc_html_e( 'Redirecting…', 'pronamic-ideal' ); ?></h1>
@@ -58,7 +46,7 @@
 							<?php esc_html_e( 'Please click the button below if you are not automatically redirected.', 'pronamic-ideal' ); ?>
 						</p>
 
-						<?php echo $this->get_form_html( $payment, $auto_submit ); ?>
+						<?php echo $this->get_form_html( $payment ); ?>
 					</div>
 				</div>