Remove additional conditions that were added

Issue #775
PopupMaker · Oct 12, 2020 · d64f850 · d64f850
1 parent 3965e98
commit d64f850
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 70 deletions.
diff --git a/classes/Integration/Form/CalderaForms.php b/classes/Integration/Form/CalderaForms.php
@@ -63,16 +63,8 @@ public function get_form_selectlist() {
 	 * @param array $form
 	 */
 	public function on_success( $form ) {
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 
 		pum_integrated_form_submission( [

diff --git a/classes/Integration/Form/ContactForm7.php b/classes/Integration/Form/ContactForm7.php
@@ -88,16 +88,8 @@ public function get_form_selectlist() {
 	 */
 	public function on_success( $cfdata ) {
 
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 
 		pum_integrated_form_submission( [

diff --git a/classes/Integration/Form/FormidableForms.php b/classes/Integration/Form/FormidableForms.php
@@ -95,16 +95,8 @@ public function on_success( $entry_id, $form_id ) {
 			return;
 		}
 
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 
 		pum_integrated_form_submission(

diff --git a/classes/Integration/Form/GravityForms.php b/classes/Integration/Form/GravityForms.php
@@ -65,16 +65,8 @@ public function get_form_selectlist() {
 	 * @param $form
 	 */
 	public function on_success( $entry, $form ) {
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 
 		pum_integrated_form_submission( [

diff --git a/classes/Integration/Form/NinjaForms.php b/classes/Integration/Form/NinjaForms.php
@@ -66,16 +66,8 @@ public function get_form_selectlist() {
 	public function on_success_v2() {
 		global $ninja_forms_processing;
 
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 
 		pum_integrated_form_submission( [

diff --git a/classes/Integration/Form/PirateForms.php b/classes/Integration/Form/PirateForms.php
@@ -127,16 +127,8 @@ public function get_form_selectlist() {
 	 * @param int $entry_id Entry ID. Will return 0 if entry storage is disabled or using WPForms Lite.
 	 */
 	public function on_success( $fields, $entry, $form_data, $entry_id ) {
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 		pum_integrated_form_submission( [
 			'popup_id'      => $popup_id,

diff --git a/classes/Integration/Form/WPForms.php b/classes/Integration/Form/WPForms.php
@@ -70,16 +70,8 @@ public function get_form_selectlist() {
 	 * @param int $entry_id Entry ID. Will return 0 if entry storage is disabled or using WPForms Lite.
 	 */
 	public function on_success( $fields, $entry, $form_data, $entry_id ) {
-		if ( ! isset( $_REQUEST['pum_form_popup_id'] ) ) {
-			return;
-		}
-
-		$popup_id = absint( $_REQUEST['pum_form_popup_id'] );
-		if ( 0 === $popup_id ) {
-			return;
-		}
-
-		$popup = pum_get_popup( $popup_id );
+		$popup_id = isset( $_REQUEST['pum_form_popup_id'] ) && absint( $_REQUEST['pum_form_popup_id'] ) > 0 ? absint( $_REQUEST['pum_form_popup_id'] ) : false;
+		$popup    = pum_get_popup( $popup_id );
 		$popup->increase_event_count( 'conversion' );
 		pum_integrated_form_submission( [
 			'popup_id'      => $popup_id,