Strategy11 / formidable-forms

classes/models/FrmFormAction.php

Indentation +162 added lines, -162 removed lines

@@ -29,7 +29,7 @@ 
 	}
 
 	/**
-     * Echo the settings update form
+	 * Echo the settings update form
 	 *
 	 * @param array $instance Current settings
 	 */
@@ -42,15 +42,15 @@ 
 	 * @return array of the default options
 	 */
 	public function get_defaults() {
-	    return array();
+		return array();
 	}
 
 	public function get_switch_fields() {
-	    return array();
+		return array();
 	}
 
 	public function migrate_values( $action, $form ) {
-	    return $action;
+		return $action;
 	}
 
 	// Functions you'll need to call.
@@ -77,16 +77,16 @@ 
 		$this->name = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 
-        $default_options = array(
-            'classes'   => '',
-            'active'    => true,
+		$default_options = array(
+			'classes'   => '',
+			'active'    => true,
 			'event'     => array( 'create' ),
-            'limit'     => 1,
-            'force_event' => false,
-            'priority'  => 20,
-            'ajax_load' => true,
-            'tooltip'   => $name,
-        );
+			'limit'     => 1,
+			'force_event' => false,
+			'priority'  => 20,
+			'ajax_load' => true,
+			'tooltip'   => $name,
+		);
 
 		$action_options = apply_filters( 'frm_' . $id_base . '_action_options', $action_options );
 		$this->action_options = wp_parse_args( $action_options, $default_options );
@@ -135,12 +135,12 @@ 
 	}
 
 	public function prepare_new( $form_id = false ) {
-        if ( $form_id ) {
-            $this->form_id = $form_id;
-        }
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
 
-        $post_content = array();
-        $default_values = $this->get_global_defaults();
+		$post_content = array();
+		$default_values = $this->get_global_defaults();
 
 		// fill default values
 		$post_content = wp_parse_args( $post_content, $default_values );
@@ -149,118 +149,118 @@ 
 			$post_content['event'] = array( reset( $this->action_options['event'] ) );
 		}
 
-        $form_action = array(
-            'post_title'    => $this->name,
-            'post_content'  => $post_content,
-            'post_excerpt'  => $this->id_base,
-            'ID'            => '',
-            'post_status'   => 'publish',
-            'post_type'     => FrmFormActionsController::$action_post_type,
+		$form_action = array(
+			'post_title'    => $this->name,
+			'post_content'  => $post_content,
+			'post_excerpt'  => $this->id_base,
+			'ID'            => '',
+			'post_status'   => 'publish',
+			'post_type'     => FrmFormActionsController::$action_post_type,
 			'post_name'     => $this->form_id . '_' . $this->id_base . '_' . $this->number,
-            'menu_order'    => $this->form_id,
-        );
+			'menu_order'    => $this->form_id,
+		);
 		unset( $post_content );
 
-        return (object) $form_action;
-    }
+		return (object) $form_action;
+	}
 
 	public function create( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-        $action = $this->prepare_new();
+		$action = $this->prepare_new();
 
 		return $this->save_settings( $action );
-    }
+	}
 
 	public function duplicate_form_actions( $form_id, $old_id ) {
-        if ( $form_id == $old_id ) {
-            // don't duplicate the actions if this is a template getting updated
-            return;
-        }
+		if ( $form_id == $old_id ) {
+			// don't duplicate the actions if this is a template getting updated
+			return;
+		}
 
-        $this->form_id = $old_id;
-        $actions = $this->get_all( $old_id );
+		$this->form_id = $old_id;
+		$actions = $this->get_all( $old_id );
 
-        $this->form_id = $form_id;
-        foreach ( $actions as $action ) {
+		$this->form_id = $form_id;
+		foreach ( $actions as $action ) {
 			$this->duplicate_one( $action, $form_id );
 			unset( $action );
-        }
-    }
+		}
+	}
 
-    /* Check if imported action should be created or updated
+	/* Check if imported action should be created or updated
     *
     * Since 2.0
     *
     * @param array $action
     * @return integer $post_id
     */
-    public function maybe_create_action( $action, $forms ) {
+	public function maybe_create_action( $action, $forms ) {
 		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
-            // Update action only
-            $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
-            $post_id = $this->save_settings( $action );
-        } else {
+			// Update action only
+			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
+			$post_id = $this->save_settings( $action );
+		} else {
 			// Create action
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
 			$post_id = $this->duplicate_one( (object) $action, $action['menu_order'] );
-        }
-        return $post_id;
-    }
+		}
+		return $post_id;
+	}
 
 	public function duplicate_one( $action, $form_id ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        $action->menu_order = $form_id;
-        $switch = $this->get_global_switch_fields();
-        foreach ( (array) $action->post_content as $key => $val ) {
+		$action->menu_order = $form_id;
+		$switch = $this->get_global_switch_fields();
+		foreach ( (array) $action->post_content as $key => $val ) {
 			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
 				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
-            } else if ( ! is_array( $val ) ) {
+			} else if ( ! is_array( $val ) ) {
 				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
 			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
-                // loop through each value if empty
+				// loop through each value if empty
 				if ( empty( $switch[ $key ] ) ) {
 					$switch[ $key ] = array_keys( $val );
 				}
 
 				foreach ( $switch[ $key ] as $subkey ) {
 					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
-                }
-            }
+				}
+			}
 
 			unset( $key, $val );
 		}
 		unset( $action->ID );
 
 		return $this->save_settings( $action );
-    }
+	}
 
 	private function duplicate_array_walk( $action, $subkey, $val ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
 		if ( is_array( $subkey ) ) {
-            foreach ( $subkey as $subkey2 ) {
-                foreach ( (array) $val as $ck => $cv ) {
+			foreach ( $subkey as $subkey2 ) {
+				foreach ( (array) $val as $ck => $cv ) {
 					if ( is_array( $cv ) ) {
 						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
 					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
 						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
-                    }
-                }
-            }
-        } else {
-            foreach ( (array) $val as $ck => $cv ) {
+					}
+				}
+			}
+		} else {
+			foreach ( (array) $val as $ck => $cv ) {
 				if ( is_array( $cv ) ) {
 					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
 				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
 					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
-                }
-            }
-        }
+				}
+			}
+		}
 
-        return $action;
-    }
+		return $action;
+	}
 
 	/**
 	 * Deal with changed settings.
@@ -269,7 +269,7 @@ 
 	 *
 	 */
  	public function update_callback( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
  		$all_instances = $this->get_settings();
 
@@ -284,7 +284,7 @@ 
  			return;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $settings as $number => $new_instance ) {
  			$this->_set( $number );
@@ -298,9 +298,9 @@ 
 			// settings were never opened, so don't update
  			if ( ! isset( $new_instance['post_title'] ) ) {
 				$this->maybe_update_status( $new_instance, $old_instance );
- 			    $action_ids[] = $new_instance['ID'];
-         		$this->updated = true;
-         		continue;
+ 				$action_ids[] = $new_instance['ID'];
+		 		$this->updated = true;
+		 		continue;
  			}
 
 			$new_instance['post_type']  = FrmFormActionsController::$action_post_type;
@@ -334,7 +334,7 @@ 
 
 			$action_ids[] = $this->save_settings( $instance );
 
-     		$this->updated = true;
+	 		$this->updated = true;
  		}
 
  		return $action_ids;
@@ -368,59 +368,59 @@ 
 			$action = $this->prepare_action( $action );
 			$this->_set( $id );
 		}
-	    return $action;
+		return $action;
 	}
 
 	public function get_one( $form_id ) {
 		return $this->get_all( $form_id, 1 );
 	}
 
-    public static function get_action_for_form( $form_id, $type = 'all', $atts = array() ) {
-        $action_controls = FrmFormActionsController::get_form_actions( $type );
+	public static function get_action_for_form( $form_id, $type = 'all', $atts = array() ) {
+		$action_controls = FrmFormActionsController::get_form_actions( $type );
 		if ( empty( $action_controls ) ) {
-            // don't continue if there are no available actions
-            return array();
-        }
+			// don't continue if there are no available actions
+			return array();
+		}
 
 		self::prepare_get_action( $atts );
 
 		$limit = apply_filters( 'frm_form_action_limit', $atts['limit'], compact( 'type', 'form_id' ) );
 
-        if ( 'all' != $type ) {
-            return $action_controls->get_all( $form_id, $limit );
-        }
+		if ( 'all' != $type ) {
+			return $action_controls->get_all( $form_id, $limit );
+		}
 
 		$args = self::action_args( $form_id, $limit );
 		$args['post_status'] = $atts['post_status'];
 		$actions = FrmDb::check_cache( serialize( $args ), 'frm_actions', $args, 'get_posts' );
 
-        if ( ! $actions ) {
-            return array();
-        }
+		if ( ! $actions ) {
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
+		$settings = array();
+		foreach ( $actions as $action ) {
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
 			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
+			$action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
 			$settings[ $action->ID ] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
 			}
-        }
+		}
 
-        if ( 1 === $limit ) {
+		if ( 1 === $limit ) {
 			$settings = reset( $settings );
-        }
+		}
 
-        return $settings;
-    }
+		return $settings;
+	}
 
 	/**
 	 * @since 3.04
@@ -460,19 +460,19 @@ 
 	}
 
 	public function get_all( $form_id = false, $limit = 99 ) {
-	    if ( $form_id ) {
-	        $this->form_id = $form_id;
-	    }
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
 
-	    $type = $this->id_base;
+		$type = $this->id_base;
 
-	    global $frm_vars;
-	    $frm_vars['action_type'] = $type;
+		global $frm_vars;
+		$frm_vars['action_type'] = $type;
 
 		add_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 		$query = self::action_args( $form_id, $limit );
-        $query['post_status']      = 'any';
-        $query['suppress_filters'] = false;
+		$query['post_status']      = 'any';
+		$query['suppress_filters'] = false;
 
 		$actions = FrmDb::check_cache( serialize( $query ) . '_type_' . $type, 'frm_actions', $query, 'get_posts' );
 		unset( $query );
@@ -480,25 +480,25 @@ 
 		remove_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 
 		if ( empty( $actions ) ) {
-            return array();
-        }
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
+		$settings = array();
+		foreach ( $actions as $action ) {
 			if ( count( $settings ) >= $limit ) {
-                continue;
-            }
+				continue;
+			}
 
 			$action = $this->prepare_action( $action );
 
 			$settings[ $action->ID ] = $action;
-        }
+		}
 
-        if ( 1 === $limit ) {
+		if ( 1 === $limit ) {
 			$settings = reset( $settings );
-        }
+		}
 
-        return $settings;
+		return $settings;
 	}
 
 	public static function action_args( $form_id = 0, $limit = 99 ) {
@@ -521,45 +521,45 @@ 
 		$action->post_content = (array) FrmAppHelper::maybe_json_decode( $action->post_content );
 		$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-        $default_values = $this->get_global_defaults();
+		$default_values = $this->get_global_defaults();
 
-        // fill default values
-        $action->post_content += $default_values;
+		// fill default values
+		$action->post_content += $default_values;
 
-        foreach ( $default_values as $k => $vals ) {
+		foreach ( $default_values as $k => $vals ) {
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
 				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
-                    continue;
-                }
+					continue;
+				}
 				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
-            }
-        }
+			}
+		}
 
 		if ( ! is_array( $action->post_content['event'] ) ) {
 			$action->post_content['event'] = explode( ',', $action->post_content['event'] );
 		}
 
-        return $action;
+		return $action;
 	}
 
 	public function destroy( $form_id = false, $type = 'default' ) {
-	    global $wpdb;
+		global $wpdb;
 
-	    $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-	    $query = array( 'post_type' => FrmFormActionsController::$action_post_type );
-	    if ( $form_id ) {
-	        $query['menu_order'] = $form_id;
-	    }
-	    if ( 'all' != $type ) {
-	        $query['post_excerpt'] = $this->id_base;
-	    }
+		$query = array( 'post_type' => FrmFormActionsController::$action_post_type );
+		if ( $form_id ) {
+			$query['menu_order'] = $form_id;
+		}
+		if ( 'all' != $type ) {
+			$query['post_excerpt'] = $this->id_base;
+		}
 
-        $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
+		$post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
 
-        foreach ( $post_ids as $id ) {
+		foreach ( $post_ids as $id ) {
 			wp_delete_post( $id );
-        }
+		}
 		self::clear_cache();
 	}
 
@@ -577,26 +577,26 @@ 
 	}
 
 	public function get_global_defaults() {
-	    $defaults = $this->get_defaults();
+		$defaults = $this->get_defaults();
 
 		if ( ! isset( $defaults['event'] ) ) {
 			$defaults['event'] = array( 'create' );
-	    }
+		}
 
 		if ( ! isset( $defaults['conditions'] ) ) {
-	        $defaults['conditions'] = array(
-                'send_stop' => '',
-                'any_all'   => '',
-            );
-        }
+			$defaults['conditions'] = array(
+				'send_stop' => '',
+				'any_all'   => '',
+			);
+		}
 
-        return $defaults;
+		return $defaults;
 	}
 
 	public function get_global_switch_fields() {
-	    $switch = $this->get_switch_fields();
+		$switch = $this->get_switch_fields();
 		$switch['conditions'] = array( 'hide_field' );
-	    return $switch;
+		return $switch;
 	}
 
 	/**
@@ -606,17 +606,17 @@ 
 		$action = $this->prepare_new( $form->id );
 		$form->options = maybe_unserialize( $form->options );
 
-        // fill with existing options
-        foreach ( $action->post_content as $name => $val ) {
+		// fill with existing options
+		foreach ( $action->post_content as $name => $val ) {
 			if ( isset( $form->options[ $name ] ) ) {
 				$action->post_content[ $name ] = $form->options[ $name ];
 				unset( $form->options[ $name ] );
-            }
-        }
+			}
+		}
 
 		$action = $this->migrate_values( $action, $form );
 
-        // check if action already exists
+		// check if action already exists
 		$post_id = get_posts(
 			array(
 				'name'          => $action->post_name,
@@ -631,17 +631,17 @@ 
 			$post_id = $this->save_settings( $action );
 		}
 
-        if ( $post_id && 'update' == $update ) {
-            global $wpdb;
+		if ( $post_id && 'update' == $update ) {
+			global $wpdb;
 			$form->options = maybe_serialize( $form->options );
 
-            // update form options
+			// update form options
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) );
-	        FrmForm::clear_form_cache();
-        }
+			FrmForm::clear_form_cache();
+		}
 
-        return $post_id;
-    }
+		return $post_id;
+	}
 
 	public static function action_conditions_met( $action, $entry ) {
 		$notification = $action->post_content;

Spacing +37 added lines, -37 removed lines

@@ -2,15 +2,15 @@ 
 
 class FrmFormAction {
 
-	public $id_base;         // Root id for all actions of this type.
-	public $name;            // Name for this action type.
+	public $id_base; // Root id for all actions of this type.
+	public $name; // Name for this action type.
 	public $option_name;
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
 	public $control_options; // Option array passed to wp_register_widget_control()
 
-	public $form_id;         // The ID of the form to evaluate
-	public $number = false;  // Unique ID number of the current instance.
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
+	public $form_id; // The ID of the form to evaluate
+	public $number = false; // Unique ID number of the current instance.
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
 
 	// Member functions that you must over-ride.
@@ -196,7 +196,7 @@ 
     * @return integer $post_id
     */
     public function maybe_create_action( $action, $forms ) {
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[$action['menu_order']] == 'updated' ) {
             // Update action only
             $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
             $post_id = $this->save_settings( $action );
@@ -214,18 +214,18 @@ 
         $action->menu_order = $form_id;
         $switch = $this->get_global_switch_fields();
         foreach ( (array) $action->post_content as $key => $val ) {
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
             } else if ( ! is_array( $val ) ) {
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
-			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
+			} else if ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
                 // loop through each value if empty
-				if ( empty( $switch[ $key ] ) ) {
-					$switch[ $key ] = array_keys( $val );
+				if ( empty( $switch[$key] ) ) {
+					$switch[$key] = array_keys( $val );
 				}
 
-				foreach ( $switch[ $key ] as $subkey ) {
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
+				foreach ( $switch[$key] as $subkey ) {
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
                 }
             }
 
@@ -243,18 +243,18 @@ 
             foreach ( $subkey as $subkey2 ) {
                 foreach ( (array) $val as $ck => $cv ) {
 					if ( is_array( $cv ) ) {
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
-					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
+					} else if ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
                     }
                 }
             }
         } else {
             foreach ( (array) $val as $ck => $cv ) {
 				if ( is_array( $cv ) ) {
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
-				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
+				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
+					$action[$ck] = $frm_duplicate_ids[$cv];
                 }
             }
         }
@@ -278,8 +278,8 @@ 
  			return;
  		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
-			$settings = $_POST[ $this->option_name ];
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
+			$settings = $_POST[$this->option_name];
  		} else {
  			return;
  		}
@@ -289,7 +289,7 @@ 
  		foreach ( $settings as $number => $new_instance ) {
  			$this->_set( $number );
 
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
 
 			if ( ! isset( $new_instance['post_status'] ) ) {
 				$new_instance['post_status'] = 'draft';
@@ -329,7 +329,7 @@ 
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
 
 			if ( false !== $instance ) {
-				$all_instances[ $number ] = $instance;
+				$all_instances[$number] = $instance;
 			}
 
 			$action_ids[] = $this->save_settings( $instance );
@@ -403,12 +403,12 @@ 
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
                 continue;
             }
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
-			$settings[ $action->ID ] = $action;
+            $action = $action_controls[$action->post_excerpt]->prepare_action( $action );
+			$settings[$action->ID] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
@@ -491,7 +491,7 @@ 
 
 			$action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
         }
 
         if ( 1 === $limit ) {
@@ -528,10 +528,10 @@ 
 
         foreach ( $default_values as $k => $vals ) {
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
                     continue;
                 }
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
             }
         }
 
@@ -608,9 +608,9 @@ 
 
         // fill with existing options
         foreach ( $action->post_content as $name => $val ) {
-			if ( isset( $form->options[ $name ] ) ) {
-				$action->post_content[ $name ] = $form->options[ $name ];
-				unset( $form->options[ $name ] );
+			if ( isset( $form->options[$name] ) ) {
+				$action->post_content[$name] = $form->options[$name];
+				unset( $form->options[$name] );
             }
         }
 
@@ -671,7 +671,7 @@ 
 				$stop = $stop ? false : true;
 			}
 
-			$met[ $stop ] = $stop;
+			$met[$stop] = $stop;
 		}
 
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -711,8 +711,8 @@ 
 	private static function get_value_from_entry( $entry, $field_id ) {
 		$observed_value = '';
 
-		if ( isset( $entry->metas[ $field_id ] ) ) {
-			$observed_value = $entry->metas[ $field_id ];
+		if ( isset( $entry->metas[$field_id] ) ) {
+			$observed_value = $entry->metas[$field_id];
 		} else if ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
 			$field = FrmField::getOne( $field_id );
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(

classes/controllers/FrmFormActionsController.php

Indentation +173 added lines, -173 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
 class FrmFormActionsController {
-    public static $action_post_type = 'frm_form_actions';
-    public static $registered_actions;
+	public static $action_post_type = 'frm_form_actions';
+	public static $registered_actions;
 
-    public static function register_post_types() {
+	public static function register_post_types() {
 		register_post_type(
 			self::$action_post_type,
 			array(
@@ -21,90 +21,90 @@ 
 			)
 		);
 
-        /**
-         * post_content: json settings
-         * menu_order: form id
-         * post_excerpt: action type
-         */
+		/**
+		 * post_content: json settings
+		 * menu_order: form id
+		 * post_excerpt: action type
+		 */
 
-        self::actions_init();
-    }
+		self::actions_init();
+	}
 
-    public static function actions_init() {
-        self::$registered_actions = new Frm_Form_Action_Factory();
-        self::register_actions();
-        do_action( 'frm_form_actions_init' );
-    }
+	public static function actions_init() {
+		self::$registered_actions = new Frm_Form_Action_Factory();
+		self::register_actions();
+		do_action( 'frm_form_actions_init' );
+	}
 
-    public static function register_actions() {
+	public static function register_actions() {
 		$action_classes = array(
-            'email'     => 'FrmEmailAction',
-            'wppost'    => 'FrmDefPostAction',
-            'register'  => 'FrmDefRegAction',
-            'paypal'    => 'FrmDefPayPalAction',
-            //'aweber'    => 'FrmDefAweberAction',
-            'mailchimp' => 'FrmDefMlcmpAction',
-            'twilio'    => 'FrmDefTwilioAction',
-            'highrise'  => 'FrmDefHrsAction',
-        );
+			'email'     => 'FrmEmailAction',
+			'wppost'    => 'FrmDefPostAction',
+			'register'  => 'FrmDefRegAction',
+			'paypal'    => 'FrmDefPayPalAction',
+			//'aweber'    => 'FrmDefAweberAction',
+			'mailchimp' => 'FrmDefMlcmpAction',
+			'twilio'    => 'FrmDefTwilioAction',
+			'highrise'  => 'FrmDefHrsAction',
+		);
 		$action_classes = apply_filters( 'frm_registered_form_actions', $action_classes );
 
 		include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php' );
 		include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php' );
 
-        foreach ( $action_classes as $action_class ) {
+		foreach ( $action_classes as $action_class ) {
 			self::$registered_actions->register( $action_class );
-        }
-    }
+		}
+	}
 
 	public static function get_form_actions( $action = 'all' ) {
-        $temp_actions = self::$registered_actions;
+		$temp_actions = self::$registered_actions;
 		if ( empty( $temp_actions ) ) {
-            self::actions_init();
-            $temp_actions = self::$registered_actions->actions;
-        } else {
-            $temp_actions = $temp_actions->actions;
-        }
+			self::actions_init();
+			$temp_actions = self::$registered_actions->actions;
+		} else {
+			$temp_actions = $temp_actions->actions;
+		}
 
-        $actions = array();
+		$actions = array();
 
-        foreach ( $temp_actions as $a ) {
-            if ( 'all' != $action && $a->id_base == $action ) {
-                return $a;
-            }
+		foreach ( $temp_actions as $a ) {
+			if ( 'all' != $action && $a->id_base == $action ) {
+				return $a;
+			}
 
 			$actions[ $a->id_base ] = $a;
-        }
-        unset( $temp_actions, $a );
-
-        $action_limit = 10;
-        if ( count( $actions ) <= $action_limit ) {
-            return $actions;
-        }
-
-        // remove the last few inactive icons if there are too many
-        $temp_actions = $actions;
-        arsort( $temp_actions );
-        foreach ( $temp_actions as $type => $a ) {
-            if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
+		}
+		unset( $temp_actions, $a );
+
+		$action_limit = 10;
+		if ( count( $actions ) <= $action_limit ) {
+			return $actions;
+		}
+
+		// remove the last few inactive icons if there are too many
+		$temp_actions = $actions;
+		arsort( $temp_actions );
+		foreach ( $temp_actions as $type => $a ) {
+			if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
 				unset( $actions[ $type ] );
-                if ( count( $actions ) <= $action_limit ) {
-                    break;
-                }
-            }
-            unset( $type, $a );
-        }
+				if ( count( $actions ) <= $action_limit ) {
+					break;
+				}
+			}
+			unset( $type, $a );
+		}
 
-        return $actions;
-    }
+		return $actions;
+	}
 
 	/**
 	 * @since 2.0
 	 */
-    public static function list_actions( $form, $values ) {
-        if ( empty( $form ) ) {
-            return;
-        }
+	public static function list_actions( $form, $values ) {
+		if ( empty( $form ) ) {
+			return;
+		}
 
 		/**
 		 * use this hook to migrate old settings into a new action
@@ -117,72 +117,72 @@ 
 		);
 		$form_actions = FrmFormAction::get_action_for_form( $form->id, 'all', $filters );
 
-        $action_controls = self::get_form_actions();
+		$action_controls = self::get_form_actions();
 
-        $action_map = array();
+		$action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-            $action_map[ $control->id_base ] = $key;
-        }
+			$action_map[ $control->id_base ] = $key;
+		}
 
-    	foreach ( $form_actions as $action ) {
-    	    if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
-    	        // don't try and show settings if action no longer exists
-    	        continue;
-    	    }
+		foreach ( $form_actions as $action ) {
+			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+				// don't try and show settings if action no longer exists
+				continue;
+			}
 
-    		self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
-    	}
-    }
+			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+		}
+	}
 
 	public static function action_control( $form_action, $form, $action_key, $action_control, $values ) {
 		$action_control->_set( $action_key );
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
-    }
+	}
 
-    public static function add_form_action() {
+	public static function add_form_action() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$action_key = absint( $_POST['list_id'] );
-        $action_type = sanitize_text_field( $_POST['type'] );
+		$action_type = sanitize_text_field( $_POST['type'] );
 
-        $action_control = self::get_form_actions( $action_type );
+		$action_control = self::get_form_actions( $action_type );
 		$action_control->_set( $action_key );
 
-        $form_id = absint( $_POST['form_id'] );
+		$form_id = absint( $_POST['form_id'] );
 
 		$form_action = $action_control->prepare_new( $form_id );
 
-        $values = array();
+		$values = array();
 		$form = self::fields_to_values( $form_id, $values );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function fill_action() {
+	public static function fill_action() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $action_key = absint( $_POST['action_id'] );
-        $action_type = sanitize_text_field( $_POST['action_type'] );
+		$action_key = absint( $_POST['action_id'] );
+		$action_type = sanitize_text_field( $_POST['action_type'] );
 
-        $action_control = self::get_form_actions( $action_type );
+		$action_control = self::get_form_actions( $action_type );
 		if ( empty( $action_control ) ) {
-            wp_die();
-        }
+			wp_die();
+		}
 
-        $form_action = $action_control->get_single_action( $action_key );
+		$form_action = $action_control->get_single_action( $action_key );
 
-        $values = array();
+		$values = array();
 		$form = self::fields_to_values( $form_action->menu_order, $values );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	private static function fields_to_values( $form_id, array &$values ) {
 		$form = FrmForm::getOne( $form_id );
@@ -193,19 +193,19 @@ 
 		);
 
 		$fields = FrmField::get_all_for_form( $form->id );
-        foreach ( $fields as $k => $f ) {
-            $f = (array) $f;
-            $opts = (array) $f['field_options'];
+		foreach ( $fields as $k => $f ) {
+			$f = (array) $f;
+			$opts = (array) $f['field_options'];
 			$f = array_merge( $opts, $f );
-            if ( ! isset( $f['post_field'] ) ) {
-                $f['post_field'] = '';
-            }
-            $values['fields'][] = $f;
+			if ( ! isset( $f['post_field'] ) ) {
+				$f['post_field'] = '';
+			}
+			$values['fields'][] = $f;
 			unset( $k, $f );
-        }
+		}
 
-        return $form;
-    }
+		return $form;
+	}
 
 	public static function update_settings( $form_id ) {
 		$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
@@ -213,9 +213,9 @@ 
 			wp_die( esc_html__( 'You do not have permission to do that', 'formidable' ) );
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $registered_actions = self::$registered_actions->actions;
+		$registered_actions = self::$registered_actions->actions;
 
 		$old_actions = FrmDb::get_col(
 			$wpdb->posts,
@@ -225,23 +225,23 @@ 
 			),
 			'ID'
 		);
-        $new_actions = array();
+		$new_actions = array();
 
-        foreach ( $registered_actions as $registered_action ) {
+		foreach ( $registered_actions as $registered_action ) {
 			$action_ids = $registered_action->update_callback( $form_id );
-            if ( ! empty( $action_ids ) ) {
-                $new_actions[] = $action_ids;
-            }
-        }
+			if ( ! empty( $action_ids ) ) {
+				$new_actions[] = $action_ids;
+			}
+		}
 
-        //Only use array_merge if there are new actions
-        if ( ! empty( $new_actions ) ) {
-            $new_actions = call_user_func_array( 'array_merge', $new_actions );
-        }
-        $old_actions = array_diff( $old_actions, $new_actions );
+		//Only use array_merge if there are new actions
+		if ( ! empty( $new_actions ) ) {
+			$new_actions = call_user_func_array( 'array_merge', $new_actions );
+		}
+		$old_actions = array_diff( $old_actions, $new_actions );
 
 		self::delete_missing_actions( $old_actions );
-    }
+	}
 
 	public static function delete_missing_actions( $old_actions ) {
 		if ( ! empty( $old_actions ) ) {
@@ -261,22 +261,22 @@ 
 		self::trigger_actions( $event, $form_id, $entry_id, 'all', $args );
 	}
 
-    /**
-     * @param string $event
-     */
+	/**
+	 * @param string $event
+	 */
 	public static function trigger_actions( $event, $form, $entry, $type = 'all', $args = array() ) {
 		$form_actions = FrmFormAction::get_action_for_form( ( is_object( $form ) ? $form->id : $form ), $type );
 
 		if ( empty( $form_actions ) ) {
-            return;
-        }
+			return;
+		}
 
 		FrmForm::maybe_get_form( $form );
 
-        $link_settings = self::get_form_actions( $type );
-        if ( 'all' != $type ) {
-            $link_settings = array( $type => $link_settings );
-        }
+		$link_settings = self::get_form_actions( $type );
+		if ( 'all' != $type ) {
+			$link_settings = array( $type => $link_settings );
+		}
 
 		$stored_actions = array();
 		$action_priority = array();
@@ -287,17 +287,17 @@ 
 			$this_event = $event;
 		}
 
-        foreach ( $form_actions as $action ) {
+		foreach ( $form_actions as $action ) {
 
 			$skip_this_action = ( ! in_array( $this_event, $action->post_content['event'] ) );
 			$skip_this_action = apply_filters( 'frm_skip_form_action', $skip_this_action, compact( 'action', 'entry', 'form', 'event' ) );
 			if ( $skip_this_action ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( ! is_object( $entry ) ) {
-                $entry = FrmEntry::getOne( $entry, true );
-            }
+			if ( ! is_object( $entry ) ) {
+				$entry = FrmEntry::getOne( $entry, true );
+			}
 
 			if ( empty( $entry ) || ( $entry->is_draft && $event != 'draft' ) ) {
 				continue;
@@ -311,64 +311,64 @@ 
 				if ( ! $trigger_children ) {
 					continue;
 				}
-            }
+			}
 
-            // check conditional logic
+			// check conditional logic
 			$stop = FrmFormAction::action_conditions_met( $action, $entry );
-            if ( $stop ) {
-                continue;
-            }
+			if ( $stop ) {
+				continue;
+			}
 
-            // store actions so they can be triggered with the correct priority
-            $stored_actions[ $action->ID ] = $action;
-            $action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+			// store actions so they can be triggered with the correct priority
+			$stored_actions[ $action->ID ] = $action;
+			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
 
 			unset( $action );
-        }
+		}
 
-        if ( ! empty( $stored_actions ) ) {
+		if ( ! empty( $stored_actions ) ) {
 			asort( $action_priority );
 
-            // make sure hooks are loaded
-            new FrmNotification();
+			// make sure hooks are loaded
+			new FrmNotification();
 
-            foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
+			foreach ( $action_priority as $action_id => $priority ) {
+				$action = $stored_actions[ $action_id ];
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
-                // If post is created, get updated $entry object
-                if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
+				// If post is created, get updated $entry object
+				if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
 					$entry = FrmEntry::getOne( $entry->id, true );
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
 
 	public static function duplicate_form_actions( $form_id, $values, $args = array() ) {
 		if ( ! isset( $args['old_id'] ) || empty( $args['old_id'] ) ) {
-            // continue if we know which actions to copy
-            return;
-        }
+			// continue if we know which actions to copy
+			return;
+		}
 
 		$action_controls = self::get_form_actions();
 
-        foreach ( $action_controls as $action_control ) {
-            $action_control->duplicate_form_actions( $form_id, $args['old_id'] );
-            unset( $action_control );
-        }
-    }
+		foreach ( $action_controls as $action_control ) {
+			$action_control->duplicate_form_actions( $form_id, $args['old_id'] );
+			unset( $action_control );
+		}
+	}
 
-    public static function limit_by_type( $where ) {
-        global $frm_vars, $wpdb;
+	public static function limit_by_type( $where ) {
+		global $frm_vars, $wpdb;
 
-        if ( ! isset( $frm_vars['action_type'] ) ) {
-            return $where;
-        }
+		if ( ! isset( $frm_vars['action_type'] ) ) {
+			return $where;
+		}
 
-        $where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
-        return $where;
-    }
+		$where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
+		return $where;
+	}
 }
 
 
@@ -395,7 +395,7 @@ 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
 			if ( ! isset( $this->actions[ $key ] ) ) {
-			    $this->actions[ $key ]->_register();
+				$this->actions[ $key ]->_register();
 			}
 		}
 	}