Deepscan fixes

classes/controllers/FrmHooksController.php

@@ -115,6 +115,7 @@ public static function load_hooks() {
 		FrmTransLiteHooksController::load_hooks();
 		FrmStrpLiteHooksController::load_hooks();
 		FrmSquareLiteHooksController::load_hooks();
+		FrmPayPalLiteHooksController::load_hooks();
 
 		// GDPR
 		add_filter( 'frm_is_field_required', 'FrmFieldGdpr::force_required_field', 10, 2 );
@@ -216,6 +217,7 @@ public static function load_admin_hooks() {
 		FrmTransLiteHooksController::load_admin_hooks();
 		FrmStrpLiteHooksController::load_admin_hooks();
 		FrmSquareLiteHooksController::load_admin_hooks();
+		FrmPayPalLiteHooksController::load_admin_hooks();
 		FrmSMTPController::load_hooks();
 		FrmOnboardingWizardController::load_admin_hooks();
 		FrmAddonsController::load_admin_hooks();

classes/helpers/FrmTipsHelper.php

@@ -246,22 +246,6 @@ public static function get_form_action_tip() {
 				'tip'  => __( 'Send leads to Mailchimp for instant email follow-up.', 'formidable' ),
 				'call' => self::cta_label(),
 			),
-			array(
-				'link' => array(
-					'content' => 'paypal-revenue',
-					'page'    => 'paypal-increase-revenue-tip',
-				),
-				'tip'  => __( 'Accept PayPal payments and grow your sales.', 'formidable' ),
-				'call' => self::cta_label(),
-			),
-			array(
-				'link' => array(
-					'content' => 'paypal-fast',
-					'page'    => 'paypal-save-time-tip',
-				),
-				'tip'  => __( 'Accept payments now with PayPal integration.', 'formidable' ),
-				'call' => self::cta_label(),
-			),
 			array(
 				'link' => array(
 					'content' => 'registration',

css/custom_theme.css.php

@@ -1669,6 +1669,6 @@
 .frm-card-errors:empty {
 	margin: 0;
 }
-<?php
 
+<?php
 echo strip_tags( FrmStylesController::get_custom_css() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

formidable.php

@@ -108,43 +108,31 @@ function frm_class_autoloader( $class_name, $filepath ) {
 		return;
 	}
 
+	$filepath = $original_filepath;
+
 	if ( preg_match( '/^FrmStrpLite.+$/', $class_name ) || preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
 		// Autoload for /stripe/ folder.
-		$filepath = $original_filepath . '/stripe/';
-
-		if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-			$filepath .= 'helpers/';
-		} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
-			$filepath .= 'controllers/';
-		} else {
-			$filepath .= 'models/';
-		}
-
-		$filepath .= $class_name . '.php';
-
-		if ( file_exists( $filepath ) ) {
-			require $filepath;
-		}
-
+		$filepath .= '/stripe/';
+	} elseif ( preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
+		$filepath .= '/square/';
+	} elseif ( preg_match( '/^FrmPayPalLite.+$/', $class_name ) ) {
+		$filepath .= '/paypal/';
+	} else {
 		return;
 	}
 
-	if ( preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
-		$filepath = $original_filepath . '/square/';
-
-		if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-			$filepath .= 'helpers/';
-		} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
-			$filepath .= 'controllers/';
-		} else {
-			$filepath .= 'models/';
-		}
+	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
+		$filepath .= 'helpers/';
+	} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
+		$filepath .= 'controllers/';
+	} else {
+		$filepath .= 'models/';
+	}
 
-		$filepath .= $class_name . '.php';
+	$filepath .= $class_name . '.php';
 
-		if ( file_exists( $filepath ) ) {
-			require $filepath;
-		}
+	if ( file_exists( $filepath ) ) {
+		require $filepath;
 	}
 }
 

js/admin/settings.js

@@ -40,7 +40,7 @@
 		}
 
 		if ( 'frm-send-test-email' === e.target.id ) {
-			showSendTestEmailModal( e );
+			showSendTestEmailModal();
 			return;
 		}
 
@@ -62,7 +62,7 @@
 		document.getElementById( 'frm-email-style-value' ).value = styleKey;
 	}
 
-	function showSendTestEmailModal( e ) {
+	function showSendTestEmailModal() {
 		if ( ! globalVars.sendTestEmailModal ) {
 			globalVars.sendTestEmailModal = frmAdminBuild.initModal( '#frm-send-test-email-modal', '400px' );
 		}

js/admin/style.js

@@ -914,14 +914,6 @@
 		titleElement.textContent = newStyleName;
 	}
 
-	/**
-	 * @param {string} templateKey
-	 * @return {HTMLElement} The template card element.
-	 */
-	function getTemplateCard( templateKey ) {
-		return document.getElementById( 'frm_template_style_cards_wrapper' ).querySelector( '.frm-style-card[data-template-key="' + templateKey + '"]' );
-	}
-
 	/**
 	 * @param {string} styleId
 	 * @return {HTMLElement} The card element.
@@ -1332,22 +1324,6 @@
 		}
 	}
 
-	/**
-	 * @param {Event} event
-	 */
-	function maybeCollapseSettings( event ) {
-		let expanded;
-		const sectionParent = event.target.parentElement;
-		if ( event.type === 'keydown' ) {
-			expanded = sectionParent.classList.toggle( 'open' );
-			jQuery( sectionParent.querySelector( '.accordion-section-content' ) ).toggle( ! expanded ).slideToggle( 150 ); // Animate toggle as in click/enter.
-		} else {
-			expanded = sectionParent.classList.contains( 'open' );
-		}
-
-		event.target.setAttribute( 'aria-expanded', expanded );
-	}
-
 	/**
 	 * @param {HTMLElement} input
 	 * @param {HTMLElement} container

js/formidable.js

@@ -2052,7 +2052,7 @@ function frmFrontFormJS() {
 			/*jshint validthis:true */
 
 			const fieldId = frmFrontForm.getFieldId( this, false );
-			if ( ! fieldId || typeof fieldId === 'undefined' ) {
+			if ( ! fieldId ) {
 				return;
 			}
 

js/src/admin/addon-state.js

@@ -248,3 +248,45 @@
 		circledIcon.querySelector( 'svg' )?.replaceWith( svg( { href: '#frm_checkmark_icon' } ) );
 	}
 }
+
+function installAddonWithCreds( e ) {
+	// Prevent the default action, let the user know we are attempting to install again and go with it.
+	e.preventDefault();
+
+	// Now let's make another Ajax request once the user has submitted their credentials.
+	const proceed = jQuery( this );
+	const el = proceed.parent().parent();
+	const plugin = proceed.attr( 'rel' );
+
+	proceed.addClass( 'frm_loading_button' );
+
+	jQuery.ajax( {
+		url: ajaxurl,
+		type: 'POST',
+		async: true,
+		cache: false,
+		dataType: 'json',
+		data: {
+			action: 'frm_install_addon',
+			nonce: frmAdminJs.nonce,
+			plugin: plugin,
+			hostname: el.find( '#hostname' ).val(),
+			username: el.find( '#username' ).val(),
+			password: el.find( '#password' ).val()
+		},
+		success: function( response ) {
+			response = response?.data ?? response;
+
+			const error = extractErrorFromAddOnResponse( response );
+			if ( error ) {
+				addonError( error, el, proceed );
+				return;
+			}
+
+			afterAddonInstall( response, proceed, message, el );
+		},
+		error: function() {
+			proceed.removeClass( 'frm_loading_button' );
+		}
+	} );
+}

js/src/admin/admin.js

@@ -240,7 +240,7 @@ window.frmAdminBuildJS = function() {
 	const frmAdminJs = frm_admin_js; // eslint-disable-line camelcase
 	const { tag, div, span, a, svg, img } = frmDom;
 	const { onClickPreventDefault } = frmDom.util;
-	const { doJsonFetch, doJsonPost } = frmDom.ajax;
+	const { doJsonPost } = frmDom.ajax;
 	frmAdminJs.contextualShortcodes = getContextualShortcodes();
 	const icons = {
 		save: svg( { href: '#frm_save_icon' } ),
@@ -2943,18 +2943,6 @@ window.frmAdminBuildJS = function() {
 		}
 	}
 
-	function scrollToField( field ) {
-		const newPos = field.getBoundingClientRect().top,
-			container = document.getElementById( 'post-body-content' );
-
-		if ( typeof animate === 'undefined' ) {
-			jQuery( container ).scrollTop( newPos );
-		} else {
-			// TODO: smooth scroll
-			jQuery( container ).animate( { scrollTop: newPos }, 500 );
-		}
-	}
-
 	function checkCalculationCreatedByUser() {
 		const calculation = this.value;
 		let warningMessage = checkMatchingParens( calculation );
@@ -5318,8 +5306,7 @@ window.frmAdminBuildJS = function() {
 
 	function addWatchLookupRow() {
 		/*jshint validthis:true */
-		let lastRowId,
-			id = jQuery( this ).closest( '.frm-single-settings' ).data( 'fid' ),
+		let id = jQuery( this ).closest( '.frm-single-settings' ).data( 'fid' ),
 			formId = thisFormId,
 			lookupBlockRows = document.getElementById( 'frm_watch_lookup_block_' + id ).children;
 		jQuery.ajax( {
@@ -6473,7 +6460,6 @@ window.frmAdminBuildJS = function() {
 	function getImageLabel( label, showLabelWithImage, imageUrl, fieldType ) {
 		let imageLabelClass,
 			originalLabel = label,
-			shape = fieldType === 'checkbox' ? 'square' : 'circle',
 			labelImage,
 			labelNode,
 			imageLabel;
@@ -9312,63 +9298,6 @@ window.frmAdminBuildJS = function() {
 		addonState.toggleAddonState( clicked, action );
 	}
 
-	function installAddonWithCreds( e ) {
-		// Prevent the default action, let the user know we are attempting to install again and go with it.
-		e.preventDefault();
-
-		// Now let's make another Ajax request once the user has submitted their credentials.
-		const proceed = jQuery( this );
-		const el = proceed.parent().parent();
-		const plugin = proceed.attr( 'rel' );
-
-		proceed.addClass( 'frm_loading_button' );
-
-		jQuery.ajax( {
-			url: ajaxurl,
-			type: 'POST',
-			async: true,
-			cache: false,
-			dataType: 'json',
-			data: {
-				action: 'frm_install_addon',
-				nonce: frmAdminJs.nonce,
-				plugin: plugin,
-				hostname: el.find( '#hostname' ).val(),
-				username: el.find( '#username' ).val(),
-				password: el.find( '#password' ).val()
-			},
-			success: function( response ) {
-				response = response?.data ?? response;
-
-				const error = extractErrorFromAddOnResponse( response );
-				if ( error ) {
-					addonError( error, el, proceed );
-					return;
-				}
-
-				afterAddonInstall( response, proceed, message, el );
-			},
-			error: function() {
-				proceed.removeClass( 'frm_loading_button' );
-			}
-		} );
-	}
-
-	function afterAddonInstall( response, button, message, el, saveAndReload, action = 'frm_activate_addon' ) {
-		const addonState = require( './addon-state' );
-		addonState.afterAddonInstall( response, button, message, el, saveAndReload, action );
-	}
-
-	function extractErrorFromAddOnResponse( response ) {
-		const addonState = require( './addon-state' );
-		return addonState.extractErrorFromAddOnResponse( response );
-	}
-
-	function addonError( response, el, button ) {
-		const addonState = require( './addon-state' );
-		addonState.addonError( response, el, button );
-	}
-
 	/* Templates */
 	function showActiveCampaignForm() {
 		loadApiEmailForm();

js/src/components/class-overlay.js

@@ -71,7 +71,7 @@ export class frmOverlay {
 
 	getButtons() {
 		const buttons = this.overlayData.buttons.map( ( button, index ) => {
-			if ( ! button.url || '' === button.url ) {
+			if ( ! button.url ) {
 				return '';
 			}
 			const buttonTypeClassname = 1 === index ? 'frm-button-primary' : 'frm-button-secondary';