| @@ -3,16 +3,12 @@ | ||
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmFormActionsController { |
| 7 | - | |
| 8 | - /** | |
| 9 | - * @var string | |
| 10 | - */ | |
| 11 | 7 | public static $action_post_type = 'frm_form_actions'; |
| 12 | 8 | |
| 13 | 9 | /** |
| 14 | - * @var Frm_Form_Action_Factory|null | |
| 10 | + * @var array|null | |
| 15 | 11 | */ |
| 16 | 12 | public static $registered_actions; |
| 17 | 13 | |
| 18 | 14 | /** |
| @@ -37,9 +33,8 @@ | ||
| 37 | 33 | 'has_archive' => false, |
| 38 | 34 | ) |
| 39 | 35 | ); |
| 40 | 36 | |
| 41 | - self::maybe_setup_unlicensed_action_gate(); | |
| 42 | 37 | self::actions_init(); |
| 43 | 38 | } |
| 44 | 39 | |
| 45 | 40 | public static function actions_init() { |
| @@ -56,30 +51,26 @@ | ||
| 56 | 51 | 'on_submit' => 'FrmOnSubmitAction', |
| 57 | 52 | 'email' => 'FrmEmailAction', |
| 58 | 53 | 'wppost' => 'FrmDefPostAction', |
| 59 | 54 | 'register' => 'FrmDefRegAction', |
| 60 | - 'stripe' => 'FrmStripeLiteAction', | |
| 61 | - 'square' => 'FrmSquareAction', | |
| 62 | - 'paypal' => 'FrmPayPalLiteAction', | |
| 63 | - 'paypal-legacy' => 'FrmDefPayPalLegacyAction', | |
| 55 | + 'paypal' => 'FrmDefPayPalAction', | |
| 64 | 56 | 'payment' => 'FrmTransLiteAction', |
| 65 | 57 | 'quiz' => 'FrmDefQuizAction', |
| 66 | 58 | 'quiz_outcome' => 'FrmDefQuizOutcomeAction', |
| 59 | + 'mailchimp' => 'FrmDefMlcmpAction', | |
| 67 | 60 | 'api' => 'FrmDefApiAction', |
| 68 | - 'mailchimp' => 'FrmDefMlcmpAction', | |
| 61 | + 'salesforce' => 'FrmDefSalesforceAction', | |
| 69 | 62 | 'activecampaign' => 'FrmDefActiveCampaignAction', |
| 70 | 63 | 'constantcontact' => 'FrmDefConstContactAction', |
| 71 | 64 | 'getresponse' => 'FrmDefGetResponseAction', |
| 65 | + 'hubspot' => 'FrmDefHubspotAction', | |
| 66 | + 'zapier' => 'FrmDefZapierAction', | |
| 67 | + 'twilio' => 'FrmDefTwilioAction', | |
| 68 | + 'highrise' => 'FrmDefHighriseAction', | |
| 72 | 69 | 'mailpoet' => 'FrmDefMailpoetAction', |
| 70 | + 'aweber' => 'FrmDefAweberAction', | |
| 73 | 71 | 'convertkit' => 'FrmDefConvertKitAction', |
| 74 | - 'aweber' => 'FrmDefAweberAction', | |
| 75 | - 'twilio' => 'FrmDefTwilioAction', | |
| 76 | - 'salesforce' => 'FrmDefSalesforceAction', | |
| 77 | - 'hubspot' => 'FrmDefHubspotAction', | |
| 78 | - 'highrise' => 'FrmDefHighriseAction', | |
| 79 | - 'zapier' => 'FrmDefZapierAction', | |
| 80 | 72 | 'googlespreadsheet' => 'FrmDefGoogleSpreadsheetAction', |
| 81 | - 'n8n' => 'FrmDefN8NAction', | |
| 82 | 73 | ); |
| 83 | 74 | |
| 84 | 75 | $action_classes = apply_filters( 'frm_registered_form_actions', $action_classes ); |
| 85 | 76 | $action_classes = self::maybe_unset_highrise( $action_classes ); |
| @@ -86,71 +77,19 @@ | ||
| 86 | 77 | |
| 87 | 78 | include_once FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php'; |
| 88 | 79 | include_once FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php'; |
| 89 | 80 | |
| 90 | - // This needs to be called after we include default_actions.php or FrmDefPayPalLegacyAction will never exist. | |
| 91 | - if ( 'FrmPayPalLiteAction' === $action_classes['paypal'] || ! class_exists( 'FrmPaymentAction' ) || ! class_exists( 'FrmDefPayPalLegacyAction' ) ) { | |
| 92 | - unset( $action_classes['paypal-legacy'] ); | |
| 93 | - } | |
| 94 | - | |
| 95 | 81 | foreach ( $action_classes as $action_class ) { |
| 96 | 82 | self::$registered_actions->register( $action_class ); |
| 97 | 83 | } |
| 98 | - | |
| 99 | - self::apply_default_action_descriptions(); | |
| 100 | 84 | } |
| 101 | 85 | |
| 102 | 86 | /** |
| 103 | - * Sets default descriptions on registered actions from a central list. | |
| 104 | - * | |
| 105 | - * Keeps the description when an add-on replaces a base action class without its own. | |
| 106 | - * | |
| 107 | - * @since 6.31 | |
| 108 | - * | |
| 109 | - * @return void | |
| 110 | - */ | |
| 111 | - private static function apply_default_action_descriptions() { | |
| 112 | - $descriptions = array( | |
| 113 | - 'on_submit' => __( 'Success messages', 'formidable' ), | |
| 114 | - 'email' => __( 'Autoresponder alerts', 'formidable' ), | |
| 115 | - 'wppost' => __( 'Content publishing', 'formidable' ), | |
| 116 | - 'register' => __( 'Account creation', 'formidable' ), | |
| 117 | - 'payment' => __( 'Transaction alerts', 'formidable' ), | |
| 118 | - 'stripe' => __( 'Payment gateway', 'formidable' ), | |
| 119 | - 'square' => __( 'Payment gateway', 'formidable' ), | |
| 120 | - 'paypal' => __( 'Payment gateway', 'formidable' ), | |
| 121 | - 'quiz' => __( 'Automated grading', 'formidable' ), | |
| 122 | - 'quiz_outcome' => __( 'Result logic', 'formidable' ), | |
| 123 | - 'aweber' => __( 'List triggers', 'formidable' ), | |
| 124 | - 'mailchimp' => __( 'Subscription confirmation', 'formidable' ), | |
| 125 | - 'zapier' => __( 'App automation', 'formidable' ), | |
| 126 | - 'n8n' => __( 'Workflow automation', 'formidable' ), | |
| 127 | - 'twilio' => __( 'Text notifications', 'formidable' ), | |
| 128 | - 'activecampaign' => __( 'Contact automation', 'formidable' ), | |
| 129 | - 'salesforce' => __( 'Lead automation', 'formidable' ), | |
| 130 | - 'constantcontact' => __( 'Content distribution', 'formidable' ), | |
| 131 | - 'getresponse' => __( 'Success notifications', 'formidable' ), | |
| 132 | - 'hubspot' => __( 'CRM alerts', 'formidable' ), | |
| 133 | - 'mailpoet' => __( 'Plugin automation', 'formidable' ), | |
| 134 | - 'api' => __( 'System integration', 'formidable' ), | |
| 135 | - 'googlespreadsheet' => __( 'Spreadsheet sync', 'formidable' ), | |
| 136 | - 'convertkit' => __( 'Broadcast publishing', 'formidable' ), | |
| 137 | - ); | |
| 138 | - | |
| 139 | - foreach ( self::$registered_actions->actions as $action ) { | |
| 140 | - if ( $action->action_options['description'] === '' && isset( $descriptions[ $action->id_base ] ) ) { | |
| 141 | - $action->action_options['description'] = $descriptions[ $action->id_base ]; | |
| 142 | - } | |
| 143 | - } | |
| 144 | - } | |
| 145 | - | |
| 146 | - /** | |
| 147 | 87 | * Remove the Highrise action if it is not registered. |
| 148 | 88 | * |
| 149 | 89 | * @since 6.23 |
| 150 | 90 | * |
| 151 | 91 | * @param array $action_classes |
| 152 | - * | |
| 153 | 92 | * @return array |
| 154 | 93 | */ |
| 155 | 94 | private static function maybe_unset_highrise( $action_classes ) { |
| 156 | 95 | if ( 'FrmDefHighriseAction' === ( $action_classes['highrise'] ?? '' ) ) { |
| @@ -164,10 +103,11 @@ | ||
| 164 | 103 | * |
| 165 | 104 | * @param array $values |
| 166 | 105 | */ |
| 167 | 106 | public static function email_settings( $values ) { |
| 168 | - $form = FrmForm::getOne( $values['id'] ); | |
| 169 | - $groups = self::form_action_groups(); | |
| 107 | + $form = FrmForm::getOne( $values['id'] ); | |
| 108 | + $groups = self::form_action_groups(); | |
| 109 | + | |
| 170 | 110 | $action_controls = self::get_form_actions(); |
| 171 | 111 | self::maybe_add_action_to_group( $action_controls, $groups ); |
| 172 | 112 | |
| 173 | 113 | $allowed = self::active_actions( $action_controls ); |
| @@ -178,41 +118,23 @@ | ||
| 178 | 118 | /** |
| 179 | 119 | * Add unknown actions to a group. |
| 180 | 120 | * |
| 181 | 121 | * @since 4.0 |
| 182 | - * | |
| 183 | - * @param array $action_controls | |
| 184 | - * @param array $groups | |
| 185 | - * | |
| 186 | - * @return void | |
| 187 | 122 | */ |
| 188 | 123 | private static function maybe_add_action_to_group( $action_controls, &$groups ) { |
| 189 | 124 | $grouped = array(); |
| 190 | - | |
| 191 | 125 | foreach ( $groups as $group ) { |
| 192 | 126 | if ( isset( $group['actions'] ) ) { |
| 193 | 127 | $grouped = array_merge( $grouped, $group['actions'] ); |
| 194 | 128 | } |
| 195 | - | |
| 196 | - // Also collect actions from sections | |
| 197 | - if ( ! isset( $group['sections'] ) ) { | |
| 198 | - continue; | |
| 199 | - } | |
| 200 | - | |
| 201 | - foreach ( $group['sections'] as $section ) { | |
| 202 | - if ( isset( $section['actions'] ) ) { | |
| 203 | - $grouped = array_merge( $grouped, $section['actions'] ); | |
| 204 | - } | |
| 205 | - } | |
| 206 | 129 | } |
| 207 | 130 | |
| 208 | 131 | foreach ( $action_controls as $action ) { |
| 209 | - if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped, true ) ) { | |
| 132 | + if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped ) ) { | |
| 210 | 133 | continue; |
| 211 | 134 | } |
| 212 | 135 | |
| 213 | 136 | $this_group = $action->action_options['group']; |
| 214 | - | |
| 215 | 137 | if ( ! isset( $groups[ $this_group ] ) ) { |
| 216 | 138 | $this_group = 'misc'; |
| 217 | 139 | } |
| 218 | 140 | |
| @@ -230,48 +152,32 @@ | ||
| 230 | 152 | * |
| 231 | 153 | * @return array |
| 232 | 154 | */ |
| 233 | 155 | public static function form_action_groups() { |
| 234 | - // Get all action controls to check which are active | |
| 235 | - $action_controls = self::get_form_actions(); | |
| 236 | - | |
| 237 | - // Determine which actions are currently available | |
| 238 | - $available_actions = self::get_available_my_actions( $action_controls ); | |
| 239 | - | |
| 240 | - // Featured actions are add-ons that are NOT currently available | |
| 241 | - $all_addon_actions = array( | |
| 242 | - 'api', | |
| 243 | - 'register', | |
| 244 | - 'n8n', | |
| 245 | - 'quiz', | |
| 246 | - 'quiz_outcome', | |
| 247 | - 'googlespreadsheet', | |
| 248 | - ); | |
| 249 | - $featured_actions = array_diff( $all_addon_actions, $available_actions ); | |
| 250 | - | |
| 251 | 156 | $groups = array( |
| 252 | - 'my_actions' => array( | |
| 253 | - 'name' => __( 'My Actions', 'formidable' ), | |
| 254 | - 'icon' => 'frmfont frm_shuffle_icon', | |
| 255 | - 'sections' => array( | |
| 256 | - 'active' => array( | |
| 257 | - 'name' => '', | |
| 258 | - 'actions' => $available_actions, | |
| 259 | - ), | |
| 260 | - 'featured' => array( | |
| 261 | - 'name' => __( 'Featured', 'formidable' ), | |
| 262 | - 'actions' => array_values( $featured_actions ), | |
| 263 | - ), | |
| 157 | + 'misc' => array( | |
| 158 | + 'name' => '', | |
| 159 | + 'icon' => 'frm_icon_font frm_shuffle_icon', | |
| 160 | + 'actions' => array( | |
| 161 | + 'email', | |
| 162 | + 'wppost', | |
| 163 | + 'register', | |
| 164 | + 'quiz', | |
| 165 | + 'quiz_outcome', | |
| 166 | + 'twilio', | |
| 264 | 167 | ), |
| 265 | 168 | ), |
| 266 | - 'payment' => array( | |
| 267 | - 'name' => __( 'E-Commerce', 'formidable' ), | |
| 268 | - 'icon' => 'frmfont frm_credit_card_alt_icon', | |
| 269 | - 'actions' => self::get_payment_actions( $action_controls ), | |
| 169 | + 'payment' => array( | |
| 170 | + 'name' => __( 'eCommerce', 'formidable' ), | |
| 171 | + 'icon' => 'frm_icon_font frm_credit_card_alt_icon', | |
| 172 | + 'actions' => array( | |
| 173 | + 'paypal', | |
| 174 | + 'payment', | |
| 175 | + ), | |
| 270 | 176 | ), |
| 271 | - 'marketing' => array( | |
| 272 | - 'name' => __( 'Marketing', 'formidable' ), | |
| 273 | - 'icon' => 'frmfont frm_mail_bulk_icon', | |
| 177 | + 'marketing' => array( | |
| 178 | + 'name' => __( 'Email Marketing', 'formidable' ), | |
| 179 | + 'icon' => 'frm_icon_font frm_mail_bulk_icon', | |
| 274 | 180 | 'actions' => array( |
| 275 | 181 | 'mailchimp', |
| 276 | 182 | 'activecampaign', |
| 277 | 183 | 'constantcontact', |
| @@ -277,22 +183,15 @@ | ||
| 277 | 183 | 'constantcontact', |
| 278 | 184 | 'getresponse', |
| 279 | 185 | 'aweber', |
| 280 | 186 | 'mailpoet', |
| 281 | - 'convertkit', | |
| 282 | - 'twilio', | |
| 283 | 187 | ), |
| 284 | 188 | ), |
| 285 | - 'crm' => array( | |
| 189 | + 'crm' => array( | |
| 286 | 190 | 'name' => __( 'CRM', 'formidable' ), |
| 287 | - 'icon' => 'frmfont frm_address_card_icon', | |
| 191 | + 'icon' => 'frm_icon_font frm_address_card_icon', | |
| 288 | 192 | 'actions' => self::get_crm_actions(), |
| 289 | 193 | ), |
| 290 | - 'misc' => array( | |
| 291 | - 'name' => __( 'Misc', 'formidable' ), | |
| 292 | - 'icon' => 'frmfont frm_shuffle_icon', | |
| 293 | - 'actions' => self::get_misc_actions( $action_controls ), | |
| 294 | - ), | |
| 295 | 194 | ); |
| 296 | 195 | |
| 297 | 196 | return apply_filters( 'frm_action_groups', $groups ); |
| 298 | 197 | } |
| @@ -297,102 +196,8 @@ | ||
| 297 | 196 | return apply_filters( 'frm_action_groups', $groups ); |
| 298 | 197 | } |
| 299 | 198 | |
| 300 | 199 | /** |
| 301 | - * Get the actions that are currently available (active) for My Actions section. | |
| 302 | - * | |
| 303 | - * @since 6.31 | |
| 304 | - * | |
| 305 | - * @param array $action_controls The registered action controls. | |
| 306 | - * | |
| 307 | - * @return array | |
| 308 | - */ | |
| 309 | - private static function get_available_my_actions( $action_controls ) { | |
| 310 | - $available = array( | |
| 311 | - 'on_submit', | |
| 312 | - 'email', | |
| 313 | - 'stripe', | |
| 314 | - 'square', | |
| 315 | - 'paypal', | |
| 316 | - ); | |
| 317 | - | |
| 318 | - // Include all actions that are marked as active, including custom actions. | |
| 319 | - // This ensures custom actions appear in "My Actions" when enabled. | |
| 320 | - foreach ( $action_controls as $action_id => $action_control ) { | |
| 321 | - if ( ! in_array( $action_id, $available, true ) && ! empty( $action_control->action_options['active'] ) ) { | |
| 322 | - $available[] = $action_id; | |
| 323 | - } | |
| 324 | - } | |
| 325 | - | |
| 326 | - return $available; | |
| 327 | - } | |
| 328 | - | |
| 329 | - /** | |
| 330 | - * Get the actions to include in the Misc section. | |
| 331 | - * | |
| 332 | - * @since 6.31 | |
| 333 | - * | |
| 334 | - * @param array $action_controls The registered action controls. | |
| 335 | - * | |
| 336 | - * @return array | |
| 337 | - */ | |
| 338 | - private static function get_misc_actions( $action_controls ) { | |
| 339 | - $misc_actions = array( | |
| 340 | - 'on_submit', | |
| 341 | - 'email', | |
| 342 | - 'wppost', | |
| 343 | - 'register', | |
| 344 | - 'api', | |
| 345 | - 'n8n', | |
| 346 | - 'quiz', | |
| 347 | - 'quiz_outcome', | |
| 348 | - 'googlespreadsheet', | |
| 349 | - ); | |
| 350 | - | |
| 351 | - // Include all active actions that aren't in specific groups (payment, marketing, crm). | |
| 352 | - // This ensures custom actions appear in "Misc" when enabled. | |
| 353 | - $payment_actions = self::get_payment_actions( $action_controls ); | |
| 354 | - $marketing_actions = array( 'mailchimp', 'activecampaign', 'constantcontact', 'getresponse', 'aweber', 'mailpoet', 'convertkit', 'twilio' ); | |
| 355 | - | |
| 356 | - $excluded_actions = array_merge( $payment_actions, $marketing_actions, self::get_crm_actions() ); | |
| 357 | - | |
| 358 | - foreach ( $action_controls as $action_id => $action_control ) { | |
| 359 | - if ( ! in_array( $action_id, $misc_actions, true ) && ! in_array( $action_id, $excluded_actions, true ) && ! empty( $action_control->action_options['active'] ) ) { | |
| 360 | - $misc_actions[] = $action_id; | |
| 361 | - } | |
| 362 | - } | |
| 363 | - | |
| 364 | - return $misc_actions; | |
| 365 | - } | |
| 366 | - | |
| 367 | - /** | |
| 368 | - * Get the actions to include in the E-Commerce section. | |
| 369 | - * | |
| 370 | - * @since 6.33 | |
| 371 | - * | |
| 372 | - * @param array $action_controls | |
| 373 | - * | |
| 374 | - * @return array | |
| 375 | - */ | |
| 376 | - private static function get_payment_actions( $action_controls ) { | |
| 377 | - $payment_actions = array( | |
| 378 | - 'paypal', | |
| 379 | - 'stripe', | |
| 380 | - 'square', | |
| 381 | - ); | |
| 382 | - | |
| 383 | - if ( isset( $action_controls['paypal-legacy'] ) ) { | |
| 384 | - $payment_actions[] = 'paypal-legacy'; | |
| 385 | - } | |
| 386 | - | |
| 387 | - if ( isset( $action_controls['payment'] ) ) { | |
| 388 | - $payment_actions[] = 'payment'; | |
| 389 | - } | |
| 390 | - | |
| 391 | - return $payment_actions; | |
| 392 | - } | |
| 393 | - | |
| 394 | - /** | |
| 395 | 200 | * Get the actions to include in the CRM section. |
| 396 | 201 | * |
| 397 | 202 | * @since 6.23 |
| 398 | 203 | * |
| @@ -401,9 +206,8 @@ | ||
| 401 | 206 | private static function get_crm_actions() { |
| 402 | 207 | $crm_actions = array( |
| 403 | 208 | 'salesforce', |
| 404 | 209 | 'hubspot', |
| 405 | - 'zapier', | |
| 406 | 210 | ); |
| 407 | 211 | |
| 408 | 212 | // Only include Highrise when the add-on is active. |
| 409 | 213 | // This is because Highrise is deprecated. We don't want to show it in Lite. |
| @@ -418,21 +222,17 @@ | ||
| 418 | 222 | * Get the number of currently active form actions. |
| 419 | 223 | * |
| 420 | 224 | * @since 4.0 |
| 421 | 225 | * |
| 422 | - * @param array $action_controls | |
| 423 | - * | |
| 424 | 226 | * @return array |
| 425 | 227 | */ |
| 426 | 228 | private static function active_actions( $action_controls ) { |
| 427 | 229 | $allowed = array(); |
| 428 | - | |
| 429 | 230 | foreach ( $action_controls as $action_control ) { |
| 430 | - if ( ! empty( $action_control->action_options['active'] ) ) { | |
| 231 | + if ( isset( $action_control->action_options['active'] ) && $action_control->action_options['active'] ) { | |
| 431 | 232 | $allowed[] = $action_control->id_base; |
| 432 | 233 | } |
| 433 | 234 | } |
| 434 | - | |
| 435 | 235 | return $allowed; |
| 436 | 236 | } |
| 437 | 237 | |
| 438 | 238 | /** |
| @@ -438,15 +238,15 @@ | ||
| 438 | 238 | /** |
| 439 | 239 | * For each add-on, add an li, class, and javascript function. If active, add an additional class. |
| 440 | 240 | * |
| 441 | 241 | * @since 4.0 |
| 442 | - * | |
| 443 | 242 | * @param object $action_control |
| 444 | 243 | * @param array $allowed |
| 445 | 244 | */ |
| 446 | 245 | public static function show_action_icon_link( $action_control, $allowed ) { |
| 447 | - $data = array(); | |
| 448 | - $classes = ' frm_' . $action_control->id_base . '_action frm_single_action'; | |
| 246 | + $data = array(); | |
| 247 | + $classes = ' frm_' . $action_control->id_base . '_action frm_single_action'; | |
| 248 | + | |
| 449 | 249 | $group_class = ' frm-group-' . $action_control->action_options['group']; |
| 450 | 250 | |
| 451 | 251 | /* translators: %s: Name of form action */ |
| 452 | 252 | $upgrade_label = sprintf( esc_html__( '%s form actions', 'formidable' ), $action_control->action_options['tooltip'] ); |
| @@ -452,20 +252,15 @@ | ||
| 452 | 252 | $upgrade_label = sprintf( esc_html__( '%s form actions', 'formidable' ), $action_control->action_options['tooltip'] ); |
| 453 | 253 | |
| 454 | 254 | $default_shown = array( 'wppost', 'register', 'payment', 'quiz', 'hubspot' ); |
| 455 | 255 | $default_shown = array_values( array_diff( $default_shown, $allowed ) ); |
| 456 | - $default_position = array_search( $action_control->id_base, $default_shown, true ); | |
| 256 | + $default_position = array_search( $action_control->id_base, $default_shown ); | |
| 457 | 257 | $allowed_count = count( $allowed ); |
| 458 | 258 | |
| 459 | - if ( ! empty( $action_control->action_options['active'] ) ) { | |
| 259 | + if ( isset( $action_control->action_options['active'] ) && $action_control->action_options['active'] ) { | |
| 460 | 260 | $classes .= ' frm_active_action'; |
| 461 | 261 | } else { |
| 462 | 262 | $classes .= ' frm_inactive_action'; |
| 463 | - | |
| 464 | - if ( str_contains( $action_control->action_options['classes'], 'frm_show_expired_modal' ) ) { | |
| 465 | - $classes .= ' frm_show_expired_modal'; | |
| 466 | - } | |
| 467 | - | |
| 468 | 263 | if ( $default_position !== false && ( $allowed_count + $default_position ) < 6 ) { |
| 469 | 264 | $group_class .= ' frm-default-show'; |
| 470 | 265 | } |
| 471 | 266 | |
| @@ -472,9 +267,8 @@ | ||
| 472 | 267 | $data['data-upgrade'] = $upgrade_label; |
| 473 | 268 | $data['data-medium'] = 'settings-' . $action_control->id_base; |
| 474 | 269 | |
| 475 | 270 | $upgrading = FrmAddonsController::install_link( $action_control->action_options['plugin'] ); |
| 476 | - | |
| 477 | 271 | if ( isset( $upgrading['url'] ) ) { |
| 478 | 272 | $data['data-oneclick'] = json_encode( $upgrading ); |
| 479 | 273 | } |
| 480 | 274 | |
| @@ -482,67 +276,41 @@ | ||
| 482 | 276 | $data['data-message'] = $action_control->action_options['message']; |
| 483 | 277 | } |
| 484 | 278 | |
| 485 | 279 | $requires = FrmFormsHelper::get_plan_required( $upgrading ); |
| 486 | - | |
| 487 | 280 | if ( $requires && 'free' !== $requires ) { |
| 488 | 281 | $data['data-requires'] = $requires; |
| 489 | 282 | } |
| 490 | - | |
| 491 | - $learn_more_slug = ! empty( $action_control->action_options['learn-more'] ) | |
| 492 | - ? $action_control->action_options['learn-more'] | |
| 493 | - : self::get_learn_more_slug( $action_control->id_base ); | |
| 494 | - | |
| 495 | - if ( $learn_more_slug ) { | |
| 496 | - $data['data-learn-more'] = FrmAppHelper::get_doc_url( | |
| 497 | - $learn_more_slug, | |
| 498 | - 'settings-' . $action_control->id_base, | |
| 499 | - ! str_contains( $learn_more_slug, '/' ) | |
| 500 | - ); | |
| 501 | - } | |
| 502 | 283 | }//end if |
| 503 | 284 | |
| 504 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_icon.php'; | |
| 505 | - } | |
| 506 | - | |
| 507 | - /** | |
| 508 | - * Get the HTML attributes for the action icon. | |
| 509 | - * | |
| 510 | - * @since 6.31 | |
| 511 | - * | |
| 512 | - * @param object $action_control | |
| 513 | - * | |
| 514 | - * @return array | |
| 515 | - */ | |
| 516 | - public static function get_action_icon_atts( $action_control ) { | |
| 517 | - if ( 'var(--primary-700)' !== $action_control->action_options['color'] ) { | |
| 518 | - return array( | |
| 285 | + // HTML to include on the icon. | |
| 286 | + $icon_atts = array(); | |
| 287 | + if ( $action_control->action_options['color'] !== 'var(--primary-700)' ) { | |
| 288 | + $icon_atts = array( | |
| 519 | 289 | 'style' => '--primary-700:' . $action_control->action_options['color'], |
| 520 | 290 | ); |
| 521 | 291 | } |
| 522 | 292 | |
| 523 | - return array(); | |
| 293 | + include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_icon.php'; | |
| 524 | 294 | } |
| 525 | 295 | |
| 526 | 296 | /** |
| 527 | 297 | * @param string $action |
| 528 | - * | |
| 529 | 298 | * @return array|FrmFormAction A single form action is returned when a specific $action value is requested. |
| 530 | 299 | */ |
| 531 | 300 | public static function get_form_actions( $action = 'all' ) { |
| 532 | 301 | $temp_actions = self::$registered_actions; |
| 533 | - | |
| 534 | - if ( $temp_actions ) { | |
| 535 | - $temp_actions = $temp_actions->actions; | |
| 536 | - } else { | |
| 302 | + if ( empty( $temp_actions ) ) { | |
| 537 | 303 | self::actions_init(); |
| 538 | 304 | $temp_actions = self::$registered_actions->actions; |
| 305 | + } else { | |
| 306 | + $temp_actions = $temp_actions->actions; | |
| 539 | 307 | } |
| 540 | 308 | |
| 541 | 309 | $actions = array(); |
| 542 | 310 | |
| 543 | 311 | foreach ( $temp_actions as $a ) { |
| 544 | - if ( 'all' !== $action && $a->id_base === $action ) { | |
| 312 | + if ( 'all' !== $action && $a->id_base == $action ) { | |
| 545 | 313 | return $a; |
| 546 | 314 | } |
| 547 | 315 | |
| 548 | 316 | $actions[ $a->id_base ] = $a; |
| @@ -552,16 +320,11 @@ | ||
| 552 | 320 | } |
| 553 | 321 | |
| 554 | 322 | /** |
| 555 | 323 | * @since 2.0 |
| 556 | - * | |
| 557 | - * @param object $form | |
| 558 | - * @param array $values | |
| 559 | - * | |
| 560 | - * @return void | |
| 561 | 324 | */ |
| 562 | 325 | public static function list_actions( $form, $values ) { |
| 563 | - if ( ! $form ) { | |
| 326 | + if ( empty( $form ) ) { | |
| 564 | 327 | return; |
| 565 | 328 | } |
| 566 | 329 | |
| 567 | 330 | /** |
| @@ -588,15 +351,11 @@ | ||
| 588 | 351 | } |
| 589 | 352 | |
| 590 | 353 | self::maybe_show_limit_warning( $form->id, $form_actions ); |
| 591 | 354 | |
| 592 | - echo '<p class="frm-mb-lg frm-no-actions-message' . ( $form_actions ? ' frm_hidden' : '' ) . '"> ' | |
| 593 | - . esc_html__( 'No actions have been added yet. Select an action above to get started.', 'formidable' ) | |
| 594 | - . '</p>'; | |
| 595 | - | |
| 596 | 355 | foreach ( $form_actions as $action ) { |
| 597 | 356 | if ( ! isset( $action_map[ $action->post_excerpt ] ) ) { |
| 598 | - // Don't try and show settings if action no longer exists | |
| 357 | + // don't try and show settings if action no longer exists | |
| 599 | 358 | continue; |
| 600 | 359 | } |
| 601 | 360 | |
| 602 | 361 | self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values ); |
| @@ -610,20 +369,17 @@ | ||
| 610 | 369 | * @since 6.17 |
| 611 | 370 | * |
| 612 | 371 | * @param int|string $form_id |
| 613 | 372 | * @param array $form_actions |
| 614 | - * | |
| 615 | 373 | * @return void |
| 616 | 374 | */ |
| 617 | 375 | private static function maybe_show_limit_warning( $form_id, $form_actions ) { |
| 618 | 376 | $count = count( $form_actions ); |
| 619 | - | |
| 620 | 377 | if ( $count < 99 ) { |
| 621 | 378 | return; |
| 622 | 379 | } |
| 623 | 380 | |
| 624 | 381 | $limit = FrmFormAction::get_action_limit( $form_id ); |
| 625 | - | |
| 626 | 382 | if ( $limit < 99 || $count < $limit ) { |
| 627 | 383 | return; |
| 628 | 384 | } |
| 629 | 385 | |
| @@ -629,9 +385,9 @@ | ||
| 629 | 385 | |
| 630 | 386 | $documentation_url = 'https://formidableforms.com/knowledgebase/frm_form_action_limit/#kb-increase-limit-of-form-actions'; |
| 631 | 387 | |
| 632 | 388 | echo '<div class="frm_warning_style">'; |
| 633 | - FrmAppHelper::icon_by_class( 'frmfont frm_alert_icon' ); | |
| 389 | + FrmAppHelper::icon_by_class( 'frm_icon_font frm_alert_icon' ); | |
| 634 | 390 | echo ' '; |
| 635 | 391 | printf( |
| 636 | 392 | // translators: %s: URL to documentation |
| 637 | 393 | esc_html__( 'You have reached your form action limit. To increase this limit, you will require additional code. Visit our documentation at %s.', 'formidable' ), |
| @@ -639,17 +395,8 @@ | ||
| 639 | 395 | ); |
| 640 | 396 | echo '</div>'; |
| 641 | 397 | } |
| 642 | 398 | |
| 643 | - /** | |
| 644 | - * @param WP_Post $form_action | |
| 645 | - * @param object $form | |
| 646 | - * @param int $action_key Action ID. | |
| 647 | - * @param FrmFormAction $action_control | |
| 648 | - * @param array $values | |
| 649 | - * | |
| 650 | - * @return void | |
| 651 | - */ | |
| 652 | 399 | public static function action_control( $form_action, $form, $action_key, $action_control, $values ) { |
| 653 | 400 | $action_control->_set( $action_key ); |
| 654 | 401 | |
| 655 | 402 | $use_logging = self::should_show_log_message( $form_action->post_excerpt ); |
| @@ -660,18 +407,13 @@ | ||
| 660 | 407 | public static function add_form_action() { |
| 661 | 408 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 662 | 409 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 663 | 410 | |
| 664 | - $action_key = FrmAppHelper::get_param( 'list_id', '', 'post', 'absint' ); | |
| 665 | - $action_type = FrmAppHelper::get_param( 'type', '', 'post', 'sanitize_text_field' ); | |
| 666 | - $lite_actions = array_fill_keys( self::get_lite_actions(), true ); | |
| 411 | + global $frm_vars; | |
| 667 | 412 | |
| 668 | - if ( ! FrmAppHelper::pro_is_connected() && ! isset( $lite_actions[ $action_type ] ) ) { | |
| 669 | - wp_die(); | |
| 670 | - } | |
| 413 | + $action_key = FrmAppHelper::get_param( 'list_id', '', 'post', 'absint' ); | |
| 414 | + $action_type = FrmAppHelper::get_param( 'type', '', 'post', 'sanitize_text_field' ); | |
| 671 | 415 | |
| 672 | - global $frm_vars; | |
| 673 | - | |
| 674 | 416 | /** |
| 675 | 417 | * @var FrmFormAction |
| 676 | 418 | */ |
| 677 | 419 | $action_control = self::get_form_actions( $action_type ); |
| @@ -676,60 +418,37 @@ | ||
| 676 | 418 | */ |
| 677 | 419 | $action_control = self::get_form_actions( $action_type ); |
| 678 | 420 | $action_control->_set( $action_key ); |
| 679 | 421 | |
| 680 | - $form_id = FrmAppHelper::get_param( 'form_id', '', 'post', 'absint' ); | |
| 681 | - $form_action = $action_control->prepare_new( $form_id ); | |
| 682 | - $existing_titles = (array) FrmAppHelper::get_post_param( 'existing_titles', array(), 'sanitize_text_field' ); | |
| 422 | + $form_id = FrmAppHelper::get_param( 'form_id', '', 'post', 'absint' ); | |
| 683 | 423 | |
| 684 | - if ( $existing_titles ) { | |
| 685 | - $form_action->post_title = self::get_unique_action_title( $form_action->post_title, $existing_titles ); | |
| 686 | - } | |
| 424 | + $form_action = $action_control->prepare_new( $form_id ); | |
| 425 | + $use_logging = self::should_show_log_message( $action_type ); | |
| 687 | 426 | |
| 688 | - $use_logging = self::should_show_log_message( $action_type ); | |
| 689 | - $values = array(); | |
| 690 | - $form = self::fields_to_values( $form_id, $values ); | |
| 427 | + $values = array(); | |
| 428 | + $form = self::fields_to_values( $form_id, $values ); | |
| 691 | 429 | |
| 692 | 430 | include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php'; |
| 693 | 431 | wp_die(); |
| 694 | 432 | } |
| 695 | 433 | |
| 696 | - /** | |
| 697 | - * Returns the first available title not in $existing_titles, appending " (2)", " (3)", etc. if needed. | |
| 698 | - * | |
| 699 | - * @since 6.31 | |
| 700 | - * | |
| 701 | - * @param string $base_title Default action title from the action type. | |
| 702 | - * @param string[] $existing_titles Titles currently visible in the form editor. | |
| 703 | - * | |
| 704 | - * @return string | |
| 705 | - */ | |
| 706 | - private static function get_unique_action_title( $base_title, array $existing_titles ) { | |
| 707 | - $taken = array_flip( $existing_titles ); | |
| 708 | - $title = $base_title; | |
| 709 | - | |
| 710 | - for ( $n = 2; isset( $taken[ $title ] ); $n++ ) { | |
| 711 | - $title = $base_title . ' (' . $n . ')'; | |
| 712 | - } | |
| 713 | - | |
| 714 | - return $title; | |
| 715 | - } | |
| 716 | - | |
| 717 | 434 | public static function fill_action() { |
| 718 | 435 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 719 | 436 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 720 | 437 | |
| 721 | - $action_key = FrmAppHelper::get_param( 'action_id', '', 'post', 'absint' ); | |
| 722 | - $action_type = FrmAppHelper::get_param( 'action_type', '', 'post', 'sanitize_text_field' ); | |
| 438 | + $action_key = FrmAppHelper::get_param( 'action_id', '', 'post', 'absint' ); | |
| 439 | + $action_type = FrmAppHelper::get_param( 'action_type', '', 'post', 'sanitize_text_field' ); | |
| 440 | + | |
| 723 | 441 | $action_control = self::get_form_actions( $action_type ); |
| 724 | - | |
| 725 | - if ( ! $action_control ) { | |
| 442 | + if ( empty( $action_control ) ) { | |
| 726 | 443 | wp_die(); |
| 727 | 444 | } |
| 728 | 445 | |
| 729 | 446 | $form_action = $action_control->get_single_action( $action_key ); |
| 730 | - $values = array(); | |
| 731 | - $form = self::fields_to_values( $form_action->menu_order, $values ); | |
| 447 | + | |
| 448 | + $values = array(); | |
| 449 | + $form = self::fields_to_values( $form_action->menu_order, $values ); | |
| 450 | + | |
| 732 | 451 | $use_logging = self::should_show_log_message( $action_type ); |
| 733 | 452 | |
| 734 | 453 | include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php'; |
| 735 | 454 | wp_die(); |
| @@ -736,40 +455,15 @@ | ||
| 736 | 455 | } |
| 737 | 456 | |
| 738 | 457 | /** |
| 739 | 458 | * @since 3.06.04 |
| 740 | - * | |
| 741 | - * @param string $action_type | |
| 742 | - * | |
| 743 | 459 | * @return bool |
| 744 | 460 | */ |
| 745 | 461 | private static function should_show_log_message( $action_type ) { |
| 746 | - $logging = array( | |
| 747 | - 'activecampaign', | |
| 748 | - 'api', | |
| 749 | - 'aweber', | |
| 750 | - 'campaignmonitor', | |
| 751 | - 'constantcontact', | |
| 752 | - 'convertkit', | |
| 753 | - 'getresponse', | |
| 754 | - 'googlespreadsheet', | |
| 755 | - 'hubspot', | |
| 756 | - 'mailchimp', | |
| 757 | - 'mailpoet', | |
| 758 | - 'n8n', | |
| 759 | - 'salesforce', | |
| 760 | - 'twilio', | |
| 761 | - 'zapier', | |
| 762 | - ); | |
| 462 | + $logging = array( 'api', 'salesforce', 'constantcontact', 'activecampaign' ); | |
| 763 | 463 | return in_array( $action_type, $logging, true ) && ! function_exists( 'frm_log_autoloader' ); |
| 764 | 464 | } |
| 765 | 465 | |
| 766 | - /** | |
| 767 | - * @param int|string $form_id | |
| 768 | - * @param array $values | |
| 769 | - * | |
| 770 | - * @return object | |
| 771 | - */ | |
| 772 | 466 | private static function fields_to_values( $form_id, array &$values ) { |
| 773 | 467 | $form = FrmForm::getOne( $form_id ); |
| 774 | 468 | |
| 775 | 469 | $values = array( |
| @@ -777,14 +471,12 @@ | ||
| 777 | 471 | 'id' => $form->id, |
| 778 | 472 | ); |
| 779 | 473 | |
| 780 | 474 | $fields = FrmField::get_all_for_form( $form->id ); |
| 781 | - | |
| 782 | 475 | foreach ( $fields as $k => $f ) { |
| 783 | 476 | $f = (array) $f; |
| 784 | 477 | $opts = (array) $f['field_options']; |
| 785 | 478 | $f = array_merge( $opts, $f ); |
| 786 | - | |
| 787 | 479 | if ( ! isset( $f['post_field'] ) ) { |
| 788 | 480 | $f['post_field'] = ''; |
| 789 | 481 | } |
| 790 | 482 | $values['fields'][] = $f; |
| @@ -795,15 +487,13 @@ | ||
| 795 | 487 | } |
| 796 | 488 | |
| 797 | 489 | /** |
| 798 | 490 | * @param int $form_id |
| 799 | - * | |
| 800 | 491 | * @return void |
| 801 | 492 | */ |
| 802 | 493 | public static function update_settings( $form_id ) { |
| 803 | 494 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 804 | 495 | $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' ); |
| 805 | - | |
| 806 | 496 | if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) { |
| 807 | 497 | $frm_settings = FrmAppHelper::get_settings(); |
| 808 | 498 | $error_args = array( |
| 809 | 499 | 'title' => __( 'Verification failed', 'formidable' ), |
| @@ -836,19 +526,17 @@ | ||
| 836 | 526 | $new_actions = array(); |
| 837 | 527 | |
| 838 | 528 | foreach ( $registered_actions as $registered_action ) { |
| 839 | 529 | $action_ids = $registered_action->update_callback( $form_id ); |
| 840 | - | |
| 841 | - if ( $action_ids ) { | |
| 530 | + if ( ! empty( $action_ids ) ) { | |
| 842 | 531 | $new_actions[] = $action_ids; |
| 843 | 532 | } |
| 844 | 533 | } |
| 845 | 534 | |
| 846 | 535 | // Only use array_merge if there are new actions. |
| 847 | - if ( $new_actions ) { | |
| 536 | + if ( ! empty( $new_actions ) ) { | |
| 848 | 537 | $new_actions = call_user_func_array( 'array_merge', $new_actions ); |
| 849 | 538 | } |
| 850 | - | |
| 851 | 539 | $old_actions = array_diff( $old_actions, $new_actions ); |
| 852 | 540 | |
| 853 | 541 | self::delete_missing_actions( $old_actions ); |
| 854 | 542 | |
| @@ -854,32 +542,17 @@ | ||
| 854 | 542 | |
| 855 | 543 | FrmOnSubmitHelper::save_on_submit_settings( $form_id ); |
| 856 | 544 | } |
| 857 | 545 | |
| 858 | - /** | |
| 859 | - * @param array $old_actions | |
| 860 | - * | |
| 861 | - * @return void | |
| 862 | - */ | |
| 863 | 546 | public static function delete_missing_actions( $old_actions ) { |
| 864 | - if ( ! $old_actions ) { | |
| 865 | - return; | |
| 547 | + if ( ! empty( $old_actions ) ) { | |
| 548 | + foreach ( $old_actions as $old_id ) { | |
| 549 | + wp_delete_post( $old_id ); | |
| 550 | + } | |
| 551 | + FrmDb::cache_delete_group( 'frm_actions' ); | |
| 866 | 552 | } |
| 867 | - | |
| 868 | - foreach ( $old_actions as $old_id ) { | |
| 869 | - wp_delete_post( $old_id ); | |
| 870 | - } | |
| 871 | - | |
| 872 | - FrmDb::cache_delete_group( 'frm_actions' ); | |
| 873 | 553 | } |
| 874 | 554 | |
| 875 | - /** | |
| 876 | - * @param int|string $entry_id | |
| 877 | - * @param int|string $form_id | |
| 878 | - * @param array $args | |
| 879 | - * | |
| 880 | - * @return void | |
| 881 | - */ | |
| 882 | 555 | public static function trigger_create_actions( $entry_id, $form_id, $args = array() ) { |
| 883 | 556 | $filter_args = $args; |
| 884 | 557 | $filter_args['entry_id'] = $entry_id; |
| 885 | 558 | $filter_args['form_id'] = $form_id; |
| @@ -896,34 +569,26 @@ | ||
| 896 | 569 | self::trigger_actions( $event, $form_id, $entry_id, 'all', $args ); |
| 897 | 570 | } |
| 898 | 571 | |
| 899 | 572 | /** |
| 900 | - * @param string $event | |
| 901 | - * @param int|object|string $form | |
| 902 | - * @param int|object|string $entry | |
| 903 | - * @param string $type | |
| 904 | - * @param array $args | |
| 905 | - * | |
| 906 | - * @return void | |
| 573 | + * @param string $event | |
| 907 | 574 | */ |
| 908 | - public static function trigger_actions( $event, $form, $entry, $type = 'all', $args = array() ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh | |
| 575 | + public static function trigger_actions( $event, $form, $entry, $type = 'all', $args = array() ) { | |
| 909 | 576 | $action_status = array( |
| 910 | 577 | 'post_status' => 'publish', |
| 911 | 578 | ); |
| 912 | - $form_actions = FrmFormAction::get_action_for_form( is_object( $form ) ? $form->id : $form, $type, $action_status ); | |
| 579 | + $form_actions = FrmFormAction::get_action_for_form( ( is_object( $form ) ? $form->id : $form ), $type, $action_status ); | |
| 913 | 580 | |
| 914 | - if ( ! $form_actions ) { | |
| 581 | + if ( empty( $form_actions ) ) { | |
| 915 | 582 | return; |
| 916 | 583 | } |
| 917 | 584 | |
| 918 | 585 | FrmForm::maybe_get_form( $form ); |
| 919 | - | |
| 920 | 586 | if ( ! is_object( $form ) ) { |
| 921 | 587 | return; |
| 922 | 588 | } |
| 923 | 589 | |
| 924 | 590 | $link_settings = self::get_form_actions( $type ); |
| 925 | - | |
| 926 | 591 | if ( 'all' !== $type ) { |
| 927 | 592 | $link_settings = array( $type => $link_settings ); |
| 928 | 593 | } |
| 929 | 594 | |
| @@ -936,11 +601,11 @@ | ||
| 936 | 601 | $this_event = $event; |
| 937 | 602 | } |
| 938 | 603 | |
| 939 | 604 | foreach ( $form_actions as $action ) { |
| 605 | + | |
| 940 | 606 | $skip_this_action = ! in_array( $this_event, $action->post_content['event'], true ) || FrmOnSubmitAction::$slug === $action->post_excerpt; |
| 941 | 607 | $skip_this_action = apply_filters( 'frm_skip_form_action', $skip_this_action, compact( 'action', 'entry', 'form', 'event' ) ); |
| 942 | - | |
| 943 | 608 | if ( $skip_this_action ) { |
| 944 | 609 | continue; |
| 945 | 610 | } |
| 946 | 611 | |
| @@ -947,18 +612,17 @@ | ||
| 947 | 612 | if ( ! is_object( $entry ) ) { |
| 948 | 613 | $entry = FrmEntry::getOne( $entry, true ); |
| 949 | 614 | } |
| 950 | 615 | |
| 951 | - if ( ! $entry || ( FrmEntriesHelper::DRAFT_ENTRY_STATUS === (int) $entry->is_draft && 'draft' !== $event ) ) { | |
| 616 | + if ( empty( $entry ) || ( FrmEntriesHelper::DRAFT_ENTRY_STATUS === (int) $entry->is_draft && 'draft' !== $event ) ) { | |
| 952 | 617 | continue; |
| 953 | 618 | } |
| 954 | 619 | |
| 955 | - $child_entry = ( is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( (int) $entry->form_id !== (int) $form->id || $entry->parent_item_id ) ) || ! empty( $args['is_child'] ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 620 | + $child_entry = ( is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( $entry->form_id != $form->id || $entry->parent_item_id ) ) || ! empty( $args['is_child'] ); | |
| 956 | 621 | |
| 957 | 622 | if ( $child_entry ) { |
| 958 | - // Maybe trigger actions for sub forms | |
| 623 | + // maybe trigger actions for sub forms | |
| 959 | 624 | $trigger_children = apply_filters( 'frm_use_embedded_form_actions', false, compact( 'form', 'entry' ) ); |
| 960 | - | |
| 961 | 625 | if ( ! $trigger_children ) { |
| 962 | 626 | continue; |
| 963 | 627 | } |
| 964 | 628 | } |
| @@ -964,9 +628,8 @@ | ||
| 964 | 628 | } |
| 965 | 629 | |
| 966 | 630 | // Check conditional logic. |
| 967 | 631 | $stop = FrmFormAction::action_conditions_met( $action, $entry ); |
| 968 | - | |
| 969 | 632 | if ( $stop ) { |
| 970 | 633 | continue; |
| 971 | 634 | } |
| 972 | 635 | |
| @@ -976,9 +639,9 @@ | ||
| 976 | 639 | |
| 977 | 640 | unset( $action ); |
| 978 | 641 | }//end foreach |
| 979 | 642 | |
| 980 | - if ( $stored_actions ) { | |
| 643 | + if ( ! empty( $stored_actions ) ) { | |
| 981 | 644 | asort( $action_priority ); |
| 982 | 645 | |
| 983 | 646 | // Make sure hooks are loaded. |
| 984 | 647 | new FrmNotification(); |
| @@ -1009,15 +672,8 @@ | ||
| 1009 | 672 | }//end foreach |
| 1010 | 673 | }//end if |
| 1011 | 674 | } |
| 1012 | 675 | |
| 1013 | - /** | |
| 1014 | - * @param int|string $form_id | |
| 1015 | - * @param array $values | |
| 1016 | - * @param array $args | |
| 1017 | - * | |
| 1018 | - * @return void | |
| 1019 | - */ | |
| 1020 | 676 | public static function duplicate_form_actions( $form_id, $values, $args = array() ) { |
| 1021 | 677 | if ( empty( $args['old_id'] ) ) { |
| 1022 | 678 | // Continue if we know which actions to copy. |
| 1023 | 679 | return; |
| @@ -1033,13 +689,8 @@ | ||
| 1033 | 689 | unset( $action_control ); |
| 1034 | 690 | } |
| 1035 | 691 | } |
| 1036 | 692 | |
| 1037 | - /** | |
| 1038 | - * @param string $where | |
| 1039 | - * | |
| 1040 | - * @return string | |
| 1041 | - */ | |
| 1042 | 693 | public static function limit_by_type( $where ) { |
| 1043 | 694 | global $frm_vars, $wpdb; |
| 1044 | 695 | |
| 1045 | 696 | if ( ! isset( $frm_vars['action_type'] ) ) { |
| @@ -1045,9 +696,11 @@ | ||
| 1045 | 696 | if ( ! isset( $frm_vars['action_type'] ) ) { |
| 1046 | 697 | return $where; |
| 1047 | 698 | } |
| 1048 | 699 | |
| 1049 | - return $where . $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] ); | |
| 700 | + $where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] ); | |
| 701 | + | |
| 702 | + return $where; | |
| 1050 | 703 | } |
| 1051 | 704 | |
| 1052 | 705 | /** |
| 1053 | 706 | * Prevent WPML from filtering form actions based on the active language. |
| @@ -1055,136 +708,19 @@ | ||
| 1055 | 708 | * @since 6.20 |
| 1056 | 709 | * |
| 1057 | 710 | * @param bool|null $null |
| 1058 | 711 | * @param string $post_type |
| 1059 | - * | |
| 1060 | 712 | * @return bool|null |
| 1061 | 713 | */ |
| 1062 | 714 | public static function prevent_wpml_translations( $null, $post_type ) { |
| 1063 | - return self::$action_post_type === $post_type ? false : $null; | |
| 1064 | - } | |
| 1065 | - | |
| 1066 | - /** | |
| 1067 | - * If Pro is not connected, hook a filter that will force all non-Lite | |
| 1068 | - * actions to inactive so the upgrade popup is shown instead. | |
| 1069 | - * | |
| 1070 | - * @since 6.31 | |
| 1071 | - * | |
| 1072 | - * @return void | |
| 1073 | - */ | |
| 1074 | - private static function maybe_setup_unlicensed_action_gate() { | |
| 1075 | - if ( FrmAppHelper::pro_is_connected() ) { | |
| 1076 | - return; | |
| 715 | + if ( self::$action_post_type === $post_type ) { | |
| 716 | + return false; | |
| 1077 | 717 | } |
| 1078 | - | |
| 1079 | - add_filter( 'frm_registered_form_actions', array( self::class, 'disable_unlicensed_actions' ), 100 ); | |
| 718 | + return $null; | |
| 1080 | 719 | } |
| 1081 | - | |
| 1082 | - /** | |
| 1083 | - * For every registered action that is not a Lite action, add a per-action | |
| 1084 | - * options filter that forces it to inactive with the upgrade class. | |
| 1085 | - * | |
| 1086 | - * Runs inside apply_filters('frm_registered_form_actions') at priority 100, | |
| 1087 | - * so the per-key option filters are in place before the class constructors | |
| 1088 | - * run in the foreach loop that follows. | |
| 1089 | - * | |
| 1090 | - * @since 6.31 | |
| 1091 | - * | |
| 1092 | - * @param array $actions Map of action_key => class_name. | |
| 1093 | - * | |
| 1094 | - * @return array | |
| 1095 | - */ | |
| 1096 | - public static function disable_unlicensed_actions( $actions ) { | |
| 1097 | - $lite_actions = array_fill_keys( self::get_lite_actions(), true ); | |
| 1098 | - | |
| 1099 | - foreach ( array_keys( $actions ) as $key ) { | |
| 1100 | - if ( isset( $lite_actions[ $key ] ) ) { | |
| 1101 | - continue; | |
| 1102 | - } | |
| 1103 | - | |
| 1104 | - add_filter( | |
| 1105 | - 'frm_' . $key . '_action_options', | |
| 1106 | - function ( $options ) { | |
| 1107 | - $options['active'] = false; | |
| 1108 | - | |
| 1109 | - if ( ! str_contains( $options['classes'], 'frm_show_upgrade' ) ) { | |
| 1110 | - $options['classes'] .= ' frm_show_upgrade'; | |
| 1111 | - } | |
| 1112 | - | |
| 1113 | - return $options; | |
| 1114 | - } | |
| 1115 | - ); | |
| 1116 | - }//end foreach | |
| 1117 | - | |
| 1118 | - return $actions; | |
| 1119 | - } | |
| 1120 | - | |
| 1121 | - /** | |
| 1122 | - * Get action keys that are available in Lite without a Pro license. | |
| 1123 | - * | |
| 1124 | - * @since 6.31 | |
| 1125 | - * | |
| 1126 | - * @return string[] | |
| 1127 | - */ | |
| 1128 | - public static function get_lite_actions() { | |
| 1129 | - return apply_filters( 'frm_lite_form_actions', array( 'on_submit', 'email', 'payment', 'stripe', 'square', 'paypal' ) ); | |
| 1130 | - } | |
| 1131 | - | |
| 1132 | - /** | |
| 1133 | - * Single source of truth for learn-more URL slugs used in | |
| 1134 | - * upgrade modals for non-Lite form actions. | |
| 1135 | - * | |
| 1136 | - * Slugs without '/' are KB doc slugs (knowledgebase/ prefix is added). | |
| 1137 | - * Slugs with '/' are direct paths (e.g. features/) used as-is. | |
| 1138 | - * | |
| 1139 | - * @since 6.31 | |
| 1140 | - * | |
| 1141 | - * @return array<string,string> Map of action_key => URL slug. | |
| 1142 | - */ | |
| 1143 | - public static function get_action_learn_more_links() { | |
| 1144 | - return array( | |
| 1145 | - 'wppost' => 'features/user-submitted-posts-wordpress-forms', | |
| 1146 | - 'register' => 'user-registration', | |
| 1147 | - 'paypal' => 'features/paypal-wordpress-payments', | |
| 1148 | - 'quiz' => 'quiz-maker-forms', | |
| 1149 | - 'quiz_outcome' => 'quiz-maker-forms', | |
| 1150 | - 'aweber' => 'features/aweber-addon', | |
| 1151 | - 'mailchimp' => 'features/mailchimp-addon', | |
| 1152 | - 'zapier' => 'features/form-entry-routing-with-zapier', | |
| 1153 | - 'twilio' => 'features/twilio-sms-form-notifications', | |
| 1154 | - 'activecampaign' => 'features/entries-to-activecampaign', | |
| 1155 | - 'salesforce' => 'features/form-entries-to-salesforce', | |
| 1156 | - 'constantcontact' => 'features/entries-to-constant-contact', | |
| 1157 | - 'getresponse' => 'features/form-entries-to-getresponse', | |
| 1158 | - 'hubspot' => 'features/form-entries-to-hubspot', | |
| 1159 | - 'mailpoet' => 'features/mailpoet-newsletters-addon', | |
| 1160 | - 'api' => 'features/wordpress-form-api', | |
| 1161 | - 'googlespreadsheet' => 'features/google-sheets', | |
| 1162 | - 'n8n' => 'features/connect-your-forms-to-any-app-with-n8n', | |
| 1163 | - 'convertkit' => 'features/convertkit', | |
| 1164 | - ); | |
| 1165 | - } | |
| 1166 | - | |
| 1167 | - /** | |
| 1168 | - * Look up the learn-more doc slug for a given action key. | |
| 1169 | - * | |
| 1170 | - * @since 6.31 | |
| 1171 | - * | |
| 1172 | - * @param string $action_key Action identifier (e.g. 'register'). | |
| 1173 | - * | |
| 1174 | - * @return string Doc slug or empty string. | |
| 1175 | - */ | |
| 1176 | - private static function get_learn_more_slug( $action_key ) { | |
| 1177 | - $links = self::get_action_learn_more_links(); | |
| 1178 | - return $links[ $action_key ] ?? ''; | |
| 1179 | - } | |
| 1180 | 720 | } |
| 1181 | 721 | |
| 1182 | 722 | class Frm_Form_Action_Factory { |
| 1183 | - | |
| 1184 | - /** | |
| 1185 | - * @var array | |
| 1186 | - */ | |
| 1187 | 723 | public $actions = array(); |
| 1188 | 724 | |
| 1189 | 725 | public function __construct() { |
| 1190 | 726 | add_action( 'frm_form_actions_init', array( $this, '_register_actions' ), 100 ); |
| @@ -1189,22 +725,12 @@ | ||
| 1189 | 725 | public function __construct() { |
| 1190 | 726 | add_action( 'frm_form_actions_init', array( $this, '_register_actions' ), 100 ); |
| 1191 | 727 | } |
| 1192 | 728 | |
| 1193 | - /** | |
| 1194 | - * @param string $action_class | |
| 1195 | - * | |
| 1196 | - * @return void | |
| 1197 | - */ | |
| 1198 | 729 | public function register( $action_class ) { |
| 1199 | 730 | $this->actions[ $action_class ] = new $action_class(); |
| 1200 | 731 | } |
| 1201 | 732 | |
| 1202 | - /** | |
| 1203 | - * @param string $action_class | |
| 1204 | - * | |
| 1205 | - * @return void | |
| 1206 | - */ | |
| 1207 | 733 | public function unregister( $action_class ) { |
| 1208 | 734 | if ( isset( $this->actions[ $action_class ] ) ) { |
| 1209 | 735 | unset( $this->actions[ $action_class ] ); |
| 1210 | 736 | } |
| @@ -1213,9 +739,9 @@ | ||
| 1213 | 739 | public function _register_actions() { |
| 1214 | 740 | $keys = array_keys( $this->actions ); |
| 1215 | 741 | |
| 1216 | 742 | foreach ( $keys as $key ) { |
| 1217 | - // Don't register new action if old action with the same id is already registered | |
| 743 | + // don't register new action if old action with the same id is already registered | |
| 1218 | 744 | if ( ! isset( $this->actions[ $key ] ) ) { |
| 1219 | 745 | $this->actions[ $key ]->_register(); |
| 1220 | 746 | } |
| 1221 | 747 | } |
