Strategy11 / formidable-forms

classes/controllers/FrmAddonsController.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 
 		$keyed_addons = array();
 		foreach ( $addons as $addon ) {
-			$keyed_addons[ $addon['info']['slug'] ] = $addon;
+			$keyed_addons[$addon['info']['slug']] = $addon;
 		}
 
 		$plugin_order = array(
@@ -49,9 +49,9 @@ 
 		);
 		$ordered_addons = array();
 		foreach ( $plugin_order as $plugin ) {
-			if ( isset( $keyed_addons[ $plugin ] ) ) {
-				$ordered_addons[] = $keyed_addons[ $plugin ];
-				unset( $keyed_addons[ $plugin ] );
+			if ( isset( $keyed_addons[$plugin] ) ) {
+				$ordered_addons[] = $keyed_addons[$plugin];
+				unset( $keyed_addons[$plugin] );
 			}
 		}
 		$addons = $ordered_addons + $keyed_addons;
@@ -86,10 +86,10 @@ 
 	}
 
 	public static function get_licenses() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-		$license = get_option('frmpro-credentials');
+		$license = get_option( 'frmpro-credentials' );
 		if ( $license && is_array( $license ) && isset( $license['license'] ) ) {
 			$url = 'http://formidablepro.com/frm-edd-api/licenses?l=' . urlencode( base64_encode( $license['license'] ) );
 			$licenses = self::send_api_request( $url, array( 'name' => 'frm_api_licence', 'expires' => 60 * 60 * 5 ) );

classes/controllers/FrmXMLController.php

Indentation +181 added lines, -181 removed lines

@@ -2,110 +2,110 @@ 
 
 class FrmXMLController {
 
-    public static function menu() {
+	public static function menu() {
 		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route' );
-    }
+	}
 
-    public static function add_default_templates() {
+	public static function add_default_templates() {
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
-    		// XML import is not enabled on your server
-    		return;
-    	}
+			// XML import is not enabled on your server
+			return;
+		}
 
-        $set_err = libxml_use_internal_errors(true);
-        $loader = libxml_disable_entity_loader( true );
+		$set_err = libxml_use_internal_errors(true);
+		$loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
-        foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
-        }
-        /*
+		foreach ( (array) $files as $file ) {
+			FrmXMLHelper::import_xml($file);
+			unset($file);
+		}
+		/*
         if(is_wp_error($result))
             $errors[] = $result->get_error_message();
         else if($result)
             $message = $result;
         */
 
-        unset( $files );
+		unset( $files );
 
-        libxml_use_internal_errors( $set_err );
-    	libxml_disable_entity_loader( $loader );
-    }
+		libxml_use_internal_errors( $set_err );
+		libxml_disable_entity_loader( $loader );
+	}
 
-    public static function route() {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route() {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
 		if ( $action == 'import_xml' ) {
-            return self::import_xml();
+			return self::import_xml();
 		} else if ( $action == 'export_xml' ) {
-            return self::export_xml();
-        } else {
-            if ( apply_filters( 'frm_xml_route', true, $action ) ) {
-                return self::form();
-            }
-        }
-    }
-
-    public static function form( $errors = array(), $message = '' ) {
+			return self::export_xml();
+		} else {
+			if ( apply_filters( 'frm_xml_route', true, $action ) ) {
+				return self::form();
+			}
+		}
+	}
+
+	public static function form( $errors = array(), $message = '' ) {
 		$where = array(
 			'parent_form_id' => array( null, 0 ),
 			'status' => array( null, '', 'published' ),
 		);
 		$forms = FrmForm::getAll( $where, 'name' );
 
-        $export_types = apply_filters( 'frm_xml_export_types',
-            array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
-        );
+		$export_types = apply_filters( 'frm_xml_export_types',
+			array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
+		);
 
-        $export_format = apply_filters( 'frm_export_formats', array(
-            'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
+		$export_format = apply_filters( 'frm_export_formats', array(
+			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 			'csv' => array( 'name' => 'CSV', 'support' => 'items', 'count' => 'single' ),
-        ) );
+		) );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/import_form.php' );
-    }
+	}
 
-    public static function import_xml() {
-        $errors = array();
-        $message = '';
+	public static function import_xml() {
+		$errors = array();
+		$message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            self::form($errors);
-            return;
-        }
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			self::form($errors);
+			return;
+		}
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
-            $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+			$errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        $file = $_FILES['frm_import_file']['tmp_name'];
+		$file = $_FILES['frm_import_file']['tmp_name'];
 
-        if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
-            $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! is_uploaded_file( $file ) ) {
+			unset($file);
+			$errors[] = __( 'The file does not exist, please try again.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
+		//add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+		$export_format = apply_filters('frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
-            // allow other file types to be imported
+		$file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
+		if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+			// allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
-            return;
-        }
-        unset($file_type);
+			return;
+		}
+		unset($file_type);
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,148 +124,148 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
-    }
+		self::form($errors, $message);
+	}
 
-    public static function export_xml() {
-        $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
-            wp_die( $error );
-        }
+	public static function export_xml() {
+		$error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
+		if ( ! empty($error) ) {
+			wp_die( $error );
+		}
 
 		$ids = FrmAppHelper::get_post_param( 'frm_export_forms', array() );
 		$type = FrmAppHelper::get_post_param( 'type', array() );
 		$format = FrmAppHelper::get_post_param( 'format', 'xml', 'sanitize_title' );
 
-        if ( ! headers_sent() && ! $type ) {
-            wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
-            die();
-        }
+		if ( ! headers_sent() && ! $type ) {
+			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
+			die();
+		}
 
-        if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+		if ( $format == 'xml' ) {
+			self::generate_xml($type, compact('ids'));
 		} if ( $format == 'csv' ) {
 			self::generate_csv( compact('ids') );
-        } else {
+		} else {
 			do_action( 'frm_export_format_' . $format, compact('ids') );
-        }
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function generate_xml( $type, $args = array() ) {
-    	global $wpdb;
+		global $wpdb;
 
-	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
-            // make sure the form is included if there are entries
-            $type[] = 'forms';
-        }
+		$type = (array) $type;
+		if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+			// make sure the form is included if there are entries
+			$type[] = 'forms';
+		}
 
-	    if ( in_array( 'forms', $type) ) {
-            // include actions with forms
-	        $type[] = 'actions';
-	    }
+		if ( in_array( 'forms', $type) ) {
+			// include actions with forms
+			$type[] = 'actions';
+		}
 
-	    $tables = array(
+		$tables = array(
 			'items'     => $wpdb->prefix . 'frm_items',
 			'forms'     => $wpdb->prefix . 'frm_forms',
-	        'posts'     => $wpdb->posts,
-	        'styles'    => $wpdb->posts,
-	        'actions'   => $wpdb->posts,
-	    );
+			'posts'     => $wpdb->posts,
+			'styles'    => $wpdb->posts,
+			'actions'   => $wpdb->posts,
+		);
 
 		$defaults = array( 'ids' => false );
-	    $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $sitename = sanitize_key( get_bloginfo( 'name' ) );
+		$sitename = sanitize_key( get_bloginfo( 'name' ) );
 
-    	if ( ! empty( $sitename ) ) {
+		if ( ! empty( $sitename ) ) {
 			$sitename .= '.';
 		}
-    	$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
+		$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
 
-    	header( 'Content-Description: File Transfer' );
-    	header( 'Content-Disposition: attachment; filename=' . $filename );
-    	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+		header( 'Content-Description: File Transfer' );
+		header( 'Content-Disposition: attachment; filename=' . $filename );
+		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 
-        //make sure ids are numeric
-    	if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
-	        $args['ids'] = array_filter( $args['ids'], 'is_numeric' );
-	    }
+		//make sure ids are numeric
+		if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
+			$args['ids'] = array_filter( $args['ids'], 'is_numeric' );
+		}
 
-	    $records = array();
+		$records = array();
 
 		foreach ( $type as $tb_type ) {
-            $where = array();
+			$where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+			$table = $tables[ $tb_type ];
 
 			$select = $table . '.id';
-            $query_vars = array();
+			$query_vars = array();
 
-            switch ( $tb_type ) {
-                case 'forms':
-                    //add forms
-                    if ( $args['ids'] ) {
+			switch ( $tb_type ) {
+				case 'forms':
+					//add forms
+					if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
-                	} else {
+					} else {
 						$where[ $table . '.status !' ] = 'draft';
-                	}
-                break;
-                case 'actions':
+					}
+				break;
+				case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+					if ( ! empty($args['ids']) ) {
 						$where['menu_order'] = $args['ids'];
-                    }
-                break;
-                case 'items':
-                    //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
-                    if ( $args['ids'] ) {
+					}
+				break;
+				case 'items':
+					//$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
+					if ( $args['ids'] ) {
 						$where[ $table . '.form_id' ] = $args['ids'];
-                    }
-                break;
-                case 'styles':
-                    // Loop through all exported forms and get their selected style IDs
-                    $form_ids = $args['ids'];
-                    $style_ids = array();
-                    foreach ( $form_ids as $form_id ) {
-                        $form_data = FrmForm::getOne( $form_id );
-                        // For forms that have not been updated while running 2.0, check if custom_style is set
-                        if ( isset( $form_data->options['custom_style'] ) ) {
-                            $style_ids[] = $form_data->options['custom_style'];
-                        }
-                        unset( $form_id, $form_data );
-                    }
+					}
+				break;
+				case 'styles':
+					// Loop through all exported forms and get their selected style IDs
+					$form_ids = $args['ids'];
+					$style_ids = array();
+					foreach ( $form_ids as $form_id ) {
+						$form_data = FrmForm::getOne( $form_id );
+						// For forms that have not been updated while running 2.0, check if custom_style is set
+						if ( isset( $form_data->options['custom_style'] ) ) {
+							$style_ids[] = $form_data->options['custom_style'];
+						}
+						unset( $form_id, $form_data );
+					}
 					$select = $table . '.ID';
-                    $where['post_type'] = 'frm_styles';
-
-                    // Only export selected styles
-                    if ( ! empty( $style_ids ) ) {
-                        $where['ID'] = $style_ids;
-                    }
-                break;
-                default:
+					$where['post_type'] = 'frm_styles';
+
+					// Only export selected styles
+					if ( ! empty( $style_ids ) ) {
+						$where['ID'] = $style_ids;
+					}
+				break;
+				default:
 					$select = $table . '.ID';
-                    $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
-                    $where['pm.meta_key'] = 'frm_form_id';
-
-                    if ( empty($args['ids']) ) {
-                        $where['pm.meta_value >'] = 1;
-                    } else {
-                        $where['pm.meta_value'] = $args['ids'];
-                    }
-                break;
-            }
+					$join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
+					$where['pm.meta_key'] = 'frm_form_id';
+
+					if ( empty($args['ids']) ) {
+						$where['pm.meta_value >'] = 1;
+					} else {
+						$where['pm.meta_value'] = $args['ids'];
+					}
+				break;
+			}
 
 			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
-        }
+			unset($tb_type);
+		}
 
 		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
-    }
+	}
 
 
 	public static function generate_csv( $atts ) {
@@ -336,14 +336,14 @@ 
 	}
 
 	/**
-	* Get the fields that should be included in the CSV export
-	*
-	* @since 2.0.19
-	*
-	* @param int $form_id
-	* @param object $form
-	* @return array $csv_fields
-	*/
+	 * Get the fields that should be included in the CSV export
+	 *
+	 * @since 2.0.19
+	 *
+	 * @param int $form_id
+	 * @param object $form
+	 * @return array $csv_fields
+	 */
 	private static function get_fields_for_csv_export( $form_id, $form ) {
 		// Phase frm_csv_field_ids out by 2.01.05
 		$csv_field_ids = apply_filters( 'frm_csv_field_ids', '', $form_id, array( 'form' => $form ) );
@@ -373,16 +373,16 @@ 
 	}
 
 	public static function allow_mime( $mimes ) {
-        if ( ! isset( $mimes['csv'] ) ) {
-            // allow csv files
-            $mimes['csv'] = 'text/csv';
-        }
-
-        if ( ! isset( $mimes['xml'] ) ) {
-            // allow xml
-            $mimes['xml'] = 'text/xml';
-        }
-
-        return $mimes;
-    }
+		if ( ! isset( $mimes['csv'] ) ) {
+			// allow csv files
+			$mimes['csv'] = 'text/csv';
+		}
+
+		if ( ! isset( $mimes['xml'] ) ) {
+			// allow xml
+			$mimes['xml'] = 'text/xml';
+		}
+
+		return $mimes;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -12,14 +12,14 @@ 
     		return;
     	}
 
-        $set_err = libxml_use_internal_errors(true);
+        $set_err = libxml_use_internal_errors( true );
         $loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
         foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
+            FrmXMLHelper::import_xml( $file );
+            unset( $file );
         }
         /*
         if(is_wp_error($result))
@@ -71,41 +71,41 @@ 
         $errors = array();
         $message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'import-xml', 'import-xml-nonce' );
         if ( $permission_error !== false ) {
             $errors[] = $permission_error;
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+        if ( ! isset( $_FILES ) || ! isset( $_FILES['frm_import_file'] ) || empty( $_FILES['frm_import_file']['name'] ) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
             $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         $file = $_FILES['frm_import_file']['tmp_name'];
 
         if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
+            unset( $file );
             $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+        $export_format = apply_filters( 'frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+        $file_type = strtolower( pathinfo( $_FILES['frm_import_file']['name'], PATHINFO_EXTENSION ) );
+        if ( $file_type != 'xml' && isset( $export_format[$file_type] ) ) {
             // allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
             return;
         }
-        unset($file_type);
+        unset( $file_type );
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,12 +124,12 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
+        self::form( $errors, $message );
     }
 
     public static function export_xml() {
         $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
+        if ( ! empty( $error ) ) {
             wp_die( $error );
         }
 
@@ -143,11 +143,11 @@ 
         }
 
         if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+            self::generate_xml( $type, compact( 'ids' ) );
 		} if ( $format == 'csv' ) {
-			self::generate_csv( compact('ids') );
+			self::generate_csv( compact( 'ids' ) );
         } else {
-			do_action( 'frm_export_format_' . $format, compact('ids') );
+			do_action( 'frm_export_format_' . $format, compact( 'ids' ) );
         }
 
         wp_die();
@@ -157,12 +157,12 @@ 
     	global $wpdb;
 
 	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+        if ( in_array( 'items', $type ) && ! in_array( 'forms', $type ) ) {
             // make sure the form is included if there are entries
             $type[] = 'forms';
         }
 
-	    if ( in_array( 'forms', $type) ) {
+	    if ( in_array( 'forms', $type ) ) {
             // include actions with forms
 	        $type[] = 'actions';
 	    }
@@ -199,7 +199,7 @@ 
 		foreach ( $type as $tb_type ) {
             $where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+            $table = $tables[$tb_type];
 
 			$select = $table . '.id';
             $query_vars = array();
@@ -210,20 +210,20 @@ 
                     if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
                 	} else {
-						$where[ $table . '.status !' ] = 'draft';
+						$where[$table . '.status !'] = 'draft';
                 	}
                 break;
                 case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+                    if ( ! empty( $args['ids'] ) ) {
 						$where['menu_order'] = $args['ids'];
                     }
                 break;
                 case 'items':
                     //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
                     if ( $args['ids'] ) {
-						$where[ $table . '.form_id' ] = $args['ids'];
+						$where[$table . '.form_id'] = $args['ids'];
                     }
                 break;
                 case 'styles':
@@ -251,7 +251,7 @@ 
                     $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
                     $where['pm.meta_key'] = 'frm_form_id';
 
-                    if ( empty($args['ids']) ) {
+                    if ( empty( $args['ids'] ) ) {
                         $where['pm.meta_value >'] = 1;
                     } else {
                         $where['pm.meta_value'] = $args['ids'];
@@ -259,11 +259,11 @@ 
                 break;
             }
 
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
+            unset( $tb_type );
         }
 
-		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
+		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo( 'charset' ) ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
     }
 
@@ -289,11 +289,11 @@ 
 			$fid = FrmAppHelper::get_param( 'fid', '', 'get', 'sanitize_text_field' );
 		}
 
-		if ( ! ini_get('safe_mode') ) {
-			set_time_limit(0); //Remove time limit to execute this function
-			$mem_limit = str_replace('M', '', ini_get('memory_limit'));
+		if ( ! ini_get( 'safe_mode' ) ) {
+			set_time_limit( 0 ); //Remove time limit to execute this function
+			$mem_limit = str_replace( 'M', '', ini_get( 'memory_limit' ) );
 			if ( (int) $mem_limit < 256 ) {
-				ini_set('memory_limit', '256M');
+				ini_set( 'memory_limit', '256M' );
 			}
 		}
 
@@ -364,7 +364,7 @@ 
 			$no_export_fields = FrmField::no_save_fields();
 			foreach ( $csv_fields as $k => $f ) {
 				if ( in_array( $f->type, $no_export_fields ) ) {
-					unset( $csv_fields[ $k ] );
+					unset( $csv_fields[$k] );
 				}
 			}
 		}

classes/controllers/FrmFormActionsController.php

Indentation +218 added lines, -218 removed lines

@@ -1,109 +1,109 @@ 
 <?php
 
 class FrmFormActionsController {
-    public static $action_post_type = 'frm_form_actions';
-    public static $registered_actions;
-
-    public static function register_post_types() {
-        register_post_type( self::$action_post_type, array(
-            'label' => __( 'Form Actions', 'formidable' ),
-            'description' => '',
-            'public' => false,
-            'show_ui' => false,
-            'exclude_from_search' => true,
-            'show_in_nav_menus' => false,
-            'show_in_menu' => true,
-            'capability_type' => 'page',
-            'supports' => array(
+	public static $action_post_type = 'frm_form_actions';
+	public static $registered_actions;
+
+	public static function register_post_types() {
+		register_post_type( self::$action_post_type, array(
+			'label' => __( 'Form Actions', 'formidable' ),
+			'description' => '',
+			'public' => false,
+			'show_ui' => false,
+			'exclude_from_search' => true,
+			'show_in_nav_menus' => false,
+			'show_in_menu' => true,
+			'capability_type' => 'page',
+			'supports' => array(
 				'title', 'editor', 'excerpt', 'custom-fields',
 				'page-attributes',
-            ),
-            'has_archive' => false,
-        ) );
-
-        /**
-         * post_content: json settings
-         * menu_order: form id
-         * post_excerpt: action type
-         */
-
-        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 register_actions() {
-        $action_classes = apply_filters( 'frm_registered_form_actions', array(
-            'email'     => 'FrmEmailAction',
-            'wppost'    => 'FrmDefPostAction',
-            'register'  => 'FrmDefRegAction',
-            'paypal'    => 'FrmDefPayPalAction',
-            //'aweber'    => 'FrmDefAweberAction',
-            'mailchimp' => 'FrmDefMlcmpAction',
-            'twilio'    => 'FrmDefTwilioAction',
-            'highrise'  => 'FrmDefHrsAction',
-        ) );
-
-        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 ) {
-            self::$registered_actions->register($action_class);
-        }
-    }
+			),
+			'has_archive' => false,
+		) );
+
+		/**
+		 * post_content: json settings
+		 * menu_order: form id
+		 * post_excerpt: action type
+		 */
+
+		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 register_actions() {
+		$action_classes = apply_filters( 'frm_registered_form_actions', array(
+			'email'     => 'FrmEmailAction',
+			'wppost'    => 'FrmDefPostAction',
+			'register'  => 'FrmDefRegAction',
+			'paypal'    => 'FrmDefPayPalAction',
+			//'aweber'    => 'FrmDefAweberAction',
+			'mailchimp' => 'FrmDefMlcmpAction',
+			'twilio'    => 'FrmDefTwilioAction',
+			'highrise'  => 'FrmDefHrsAction',
+		) );
+
+		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 ) {
+			self::$registered_actions->register($action_class);
+		}
+	}
 
 	public static function get_form_actions( $action = 'all' ) {
-        $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
-            self::actions_init();
-            $temp_actions = self::$registered_actions->actions;
-        } else {
-            $temp_actions = $temp_actions->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;
+		}
 
-        $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
@@ -113,116 +113,116 @@ 
 
 		$form_actions = FrmFormAction::get_action_for_form( $form->id );
 
-        $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);
+		$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->_set($action_key);
+		$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);
+		$form_action = $action_control->prepare_new($form_id);
 
-        $values = array();
-        $form = self::fields_to_values($form_id, $values);
+		$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 );
-        if ( empty($action_control) ) {
-            wp_die();
-        }
+		$action_control = self::get_form_actions( $action_type );
+		if ( empty($action_control) ) {
+			wp_die();
+		}
 
-        $form_action = $action_control->get_single_action( $action_key );
+		$form_action = $action_control->get_single_action( $action_key );
 
-        $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+		$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);
+		$form = FrmForm::getOne($form_id);
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
-        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;
-            unset($k, $f);
-        }
-
-        return $form;
-    }
+		$fields = FrmField::get_all_for_form($form->id);
+		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;
+			unset($k, $f);
+		}
+
+		return $form;
+	}
 
 	public static function update_settings( $form_id ) {
-        global $wpdb;
+		global $wpdb;
 
-        $registered_actions = self::$registered_actions->actions;
+		$registered_actions = self::$registered_actions->actions;
 
 		$old_actions = FrmDb::get_col( $wpdb->posts, array( 'post_type' => self::$action_post_type, 'menu_order' => $form_id ), 'ID' );
-        $new_actions = array();
+		$new_actions = array();
 
-        foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
-            if ( ! empty( $action_ids ) ) {
-                $new_actions[] = $action_ids;
-            }
-        }
+		foreach ( $registered_actions as $registered_action ) {
+			$action_ids = $registered_action->update_callback($form_id);
+			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 ) ) {
@@ -242,36 +242,36 @@ 
 		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 = $action_priority = array();
+		$stored_actions = $action_priority = array();
 
 		$importing = in_array( $event, array( 'create', 'update' ) ) && defined( 'WP_IMPORTING' ) && WP_IMPORTING;
 
-        foreach ( $form_actions as $action ) {
+		foreach ( $form_actions as $action ) {
 			$trigger_on_import = $importing && in_array( 'import', $action->post_content['event'] );
 			if ( ! in_array( $event, $action->post_content['event'] ) && ! $trigger_on_import ) {
-                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;
@@ -280,66 +280,66 @@ 
 			$child_entry = ( ( $form && is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( $entry->form_id != $form->id || $entry->parent_item_id ) ) || ( isset( $args['is_child'] ) && $args['is_child'] ) );
 
 			if ( $child_entry ) {
-                //don't trigger actions for sub forms
-                continue;
-            }
+				//don't trigger actions for sub forms
+				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);
-        }
+			unset($action);
+		}
 
-        if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+		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' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
-                }
-            }
-        }
-    }
+				// 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;
-        }
+		if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+			// continue if we know which actions to copy
+			return;
+		}
 
-        $action_controls = self::get_form_actions( );
+		$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;
+	}
 }
 
 
@@ -366,7 +366,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();
 			}
 		}
 	}

Spacing +35 added lines, -35 removed lines

@@ -48,17 +48,17 @@ 
             'highrise'  => 'FrmDefHrsAction',
         ) );
 
-        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');
+        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 ) {
-            self::$registered_actions->register($action_class);
+            self::$registered_actions->register( $action_class );
         }
     }
 
 	public static function get_form_actions( $action = 'all' ) {
         $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
+        if ( empty( $temp_actions ) ) {
             self::actions_init();
             $temp_actions = self::$registered_actions->actions;
         } else {
@@ -72,7 +72,7 @@ 
                 return $a;
             }
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
         }
         unset( $temp_actions, $a );
 
@@ -86,7 +86,7 @@ 
         arsort( $temp_actions );
         foreach ( $temp_actions as $type => $a ) {
             if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
-				unset( $actions[ $type ] );
+				unset( $actions[$type] );
                 if ( count( $actions ) <= $action_limit ) {
                     break;
                 }
@@ -118,26 +118,26 @@ 
         $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 ] ) ) {
+    	    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);
+        $action_control->_set( $action_key );
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
     }
 
     public static function add_form_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $frm_vars;
@@ -146,55 +146,55 @@ 
         $action_type = sanitize_text_field( $_POST['type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+        $action_control->_set( $action_key );
 
         $form_id = absint( $_POST['form_id'] );
 
-        $form_action = $action_control->prepare_new($form_id);
+        $form_action = $action_control->prepare_new( $form_id );
 
         $values = array();
-        $form = self::fields_to_values($form_id, $values);
+        $form = self::fields_to_values( $form_id, $values );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
         wp_die();
     }
 
     public static function fill_action() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $action_key = absint( $_POST['action_id'] );
         $action_type = sanitize_text_field( $_POST['action_type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
+        if ( empty( $action_control ) ) {
             wp_die();
         }
 
         $form_action = $action_control->get_single_action( $action_key );
 
         $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+        $form = self::fields_to_values( $form_action->menu_order, $values );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
         wp_die();
     }
 
 	private static function fields_to_values( $form_id, array &$values ) {
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
         foreach ( $fields as $k => $f ) {
             $f = (array) $f;
             $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
+            $f = array_merge( $opts, $f );
             if ( ! isset( $f['post_field'] ) ) {
                 $f['post_field'] = '';
             }
             $values['fields'][] = $f;
-            unset($k, $f);
+            unset( $k, $f );
         }
 
         return $form;
@@ -209,7 +209,7 @@ 
         $new_actions = array();
 
         foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
+            $action_ids = $registered_action->update_callback( $form_id );
             if ( ! empty( $action_ids ) ) {
                 $new_actions[] = $action_ids;
             }
@@ -291,33 +291,33 @@ 
             }
 
             // 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'];
+            $stored_actions[$action->ID] = $action;
+            $action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
-            unset($action);
+            unset( $action );
         }
 
         if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+            asort( $action_priority );
 
             // make sure hooks are loaded
             new FrmNotification();
 
             foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
+                $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' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
+                    $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']) ) {
+        if ( ! isset( $args['old_id'] ) || empty( $args['old_id'] ) ) {
             // continue if we know which actions to copy
             return;
         }
@@ -351,22 +351,22 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset($this->actions[ $action_class ]);
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
 	public function _register_actions() {
-		$keys = array_keys($this->actions);
+		$keys = array_keys( $this->actions );
 
 		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();
+			if ( ! isset( $this->actions[$key] ) ) {
+			    $this->actions[$key]->_register();
 			}
 		}
 	}

formidable.php

Indentation +19 added lines, -19 removed lines

@@ -23,41 +23,41 @@
 
 global $frm_vars;
 $frm_vars = array(
-    'load_css' => false, 'forms_loaded' => array(),
-    'created_entries'   => array(),
-    'pro_is_authorized' => false,
+	'load_css' => false, 'forms_loaded' => array(),
+	'created_entries'   => array(),
+	'pro_is_authorized' => false,
 );
 
 function frm_forms_autoloader( $class_name ) {
-    // Only load Frm classes here
+	// Only load Frm classes here
 	if ( ! preg_match( '/^Frm.+$/', $class_name ) ) {
-        return;
-    }
+		return;
+	}
 
-    $filepath = dirname(__FILE__);
+	$filepath = dirname(__FILE__);
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
-        $filepath .= '/pro';
-    }
-    $filepath .= '/classes';
+		$filepath .= '/pro';
+	}
+	$filepath .= '/classes';
 
 	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-        $filepath .= '/helpers/';
+		$filepath .= '/helpers/';
 	} else if ( preg_match( '/^.+Controller$/', $class_name ) ) {
-        $filepath .= '/controllers/';
-    } else {
-        $filepath .= '/models/';
-    }
+		$filepath .= '/controllers/';
+	} else {
+		$filepath .= '/models/';
+	}
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
-    }
+	if ( file_exists($filepath) ) {
+		include($filepath);
+	}
 }
 
 // if __autoload is active, put it on the spl_autoload stack
 if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+	spl_autoload_register('__autoload');
 }
 
 // Add the autoloader

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
         return;
     }
 
-    $filepath = dirname(__FILE__);
+    $filepath = dirname( __FILE__ );
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
         $filepath .= '/pro';
     }
@@ -50,25 +50,25 @@ 
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
+    if ( file_exists( $filepath ) ) {
+        include( $filepath );
     }
 }
 
 // if __autoload is active, put it on the spl_autoload stack
-if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
+    spl_autoload_register( '__autoload' );
 }
 
 // Add the autoloader
-spl_autoload_register('frm_forms_autoloader');
+spl_autoload_register( 'frm_forms_autoloader' );
 
-$frm_path = dirname(__FILE__);
-if ( file_exists($frm_path . '/pro/formidable-pro.php') ) {
+$frm_path = dirname( __FILE__ );
+if ( file_exists( $frm_path . '/pro/formidable-pro.php' ) ) {
 	include( $frm_path . '/pro/formidable-pro.php' );
 }
 
 FrmHooksController::trigger_load_hook();
 
 include_once( $frm_path . '/deprecated.php' );
-unset($frm_path);
+unset( $frm_path );

classes/views/frm-fields/radio.php

Indentation +8 added lines, -8 removed lines

@@ -1,22 +1,22 @@
 <?php
 if ( ! is_array($field['options']) ) {
-    return;
+	return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+	$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+	$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-    // Get string for Other text field, if needed
+	// Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+	$checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-    } else {
+	} else {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-    }
+	}
 
-    unset($checked, $other_val);
+	unset($checked, $other_val);
 }

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if ( ! is_array($field['options']) ) {
+if ( ! is_array( $field['options'] ) ) {
     return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+    $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+    $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 
     // Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+    $checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
@@ -18,5 +18,5 @@ 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
     }
 
-    unset($checked, $other_val);
+    unset( $checked, $other_val );
 }

classes/views/frm-fields/show-build.php

Indentation +14 added lines, -14 removed lines

@@ -3,38 +3,38 @@ 
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '') . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+	?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	$field['default_value'] = maybe_unserialize($field['default_value']);
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
+	} else {
+		do_action('frm_add_multiple_opts_labels', $field); ?>
         <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
-    }
+	}
 } else if ( $field['type'] == 'select' ) {
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
-    } else { ?>
+	} else { ?>
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
         <?php } ?>
     </select>
 <?php }
 
-    if ( $display['default_blank'] ) { ?>
+	if ( $display['default_blank'] ) { ?>
         <span id="frm_clear_on_focus_<?php echo esc_attr( $field['id'] ) ?>" class="frm_clear_on_focus frm-show-click">
 		<?php FrmFieldsHelper::show_default_blank_js( $field['default_blank'] ); ?>
         </span>
@@ -50,18 +50,18 @@ 
         <?php FrmFieldsHelper::show_single_option($field); ?>
         </ul>
 <?php
-    } ?>
+	} ?>
     </div>
 <?php
 } else if ( $field['type'] == 'captcha' ) {
 	if ( empty($frm_settings->pubkey) ) { ?>
     <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
     <?php
-    } ?>
+	} ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>
     <input type="hidden" name="<?php echo esc_attr( $field_name ) ?>" value="1" />
 <?php
 } else {
-    do_action( 'frm_display_added_fields', $field );
+	do_action( 'frm_display_added_fields', $field );
 	do_action( 'frm_display_added_' . $field['type'] . '_field', $field );
 }

Spacing +14 added lines, -14 removed lines

@@ -1,33 +1,33 @@ 
 <?php if ( in_array( $display['type'], array( 'text', 'website', 'email', 'url' ) ) ) { ?>
-	<input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '') . ';"' ) : ''; ?> class="dyn_default_value" />
+	<input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : ''; ?> class="dyn_default_value" />
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea( force_balance_tags( $field['default_value'] ) ); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    $field['default_value'] = maybe_unserialize( $field['default_value'] );
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
+        do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
     }
 } else if ( $field['type'] == 'select' ) {
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
     } else { ?>
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
         <?php } ?>
@@ -45,17 +45,17 @@ 
     <?php
 
 	if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) { ?>
-        <?php do_action('frm_add_multiple_opts_labels', $field); ?>
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count($field['options']) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
-        <?php FrmFieldsHelper::show_single_option($field); ?>
+        <?php do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
+        <?php FrmFieldsHelper::show_single_option( $field ); ?>
         </ul>
 <?php
     } ?>
     </div>
 <?php
 } else if ( $field['type'] == 'captcha' ) {
-	if ( empty($frm_settings->pubkey) ) { ?>
-    <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
+	if ( empty( $frm_settings->pubkey ) ) { ?>
+    <div class="howto frm_no_captcha_text"><?php printf( __( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>' ) ?></div>
     <?php
     } ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>

classes/views/frm-fields/import_choices.php

Indentation +17 added lines, -17 removed lines

@@ -4,18 +4,18 @@ 
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
     <title><?php bloginfo('name'); ?></title>
     <?php
-    wp_admin_css( 'global' );
-    wp_admin_css();
-    wp_admin_css( 'colors' );
-    wp_admin_css( 'ie' );
+	wp_admin_css( 'global' );
+	wp_admin_css();
+	wp_admin_css( 'colors' );
+	wp_admin_css( 'ie' );
 	if ( is_multisite() ) {
-    	wp_admin_css( 'ms' );
+		wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+	do_action('admin_print_styles');
+	do_action('admin_print_scripts');
 
-    ?>
+	?>
 </head>
 <body class="wp-admin no-js wp-core-ui frm_field_opts_popup <?php echo esc_attr( apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class ); ?>">
 <div class="frm_med_padding">
@@ -29,21 +29,21 @@ 
 <?php
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
-    //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
-        continue;
-    }
+	//If it is an other option, don't include it
+	if ( $fkey && strpos( $fkey, 'other') !== false ) {
+		continue;
+	}
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+		$label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
+		$value = (isset($fopt['value'])) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
-            echo "$label|$value\n";
+			echo "$label|$value\n";
 		} else {
 			echo $label . "\n";
-        }
+		}
 	} else {
 		echo $fopt . "\n";
-    }
+	}
 } ?>
 </textarea>
 

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
-    <title><?php bloginfo('name'); ?></title>
+    <title><?php bloginfo( 'name' ); ?></title>
     <?php
     wp_admin_css( 'global' );
     wp_admin_css();
@@ -12,8 +12,8 @@ 
     	wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+    do_action( 'admin_print_styles' );
+    do_action( 'admin_print_scripts' );
 
     ?>
 </head>
@@ -22,7 +22,7 @@ 
 <p class="howto"><?php _e( 'Edit or add field options (one per line)', 'formidable' ) ?></p>
 <ul class="frm_prepop">
 	<?php foreach ( $prepop as $label => $pop ) { ?>
-    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace("'", '&#145;', json_encode($pop)) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
+    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace( "'", '&#145;', json_encode( $pop ) ) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
     <?php } ?>
 </ul>
 <textarea name="frm_bulk_options" id="frm_bulk_options">
@@ -30,12 +30,12 @@ 
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
     //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
+    if ( $fkey && strpos( $fkey, 'other' ) !== false ) {
         continue;
     }
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+        $label = ( isset( $fopt['label'] ) ) ? $fopt['label'] : reset( $fopt );
+        $value = ( isset( $fopt['value'] ) ) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
             echo "$label|$value\n";
 		} else {

classes/views/shared/mb_adv_info.php

Indentation +65 added lines, -65 removed lines

@@ -42,51 +42,51 @@ 
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
+					if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
 						$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
-                        if ( ! in_array( $linked_form, $linked_forms ) ) {
-                            $linked_forms[] = $linked_form;
+						if ( ! in_array( $linked_form, $linked_forms ) ) {
+							$linked_forms[] = $linked_form;
 							$linked_fields = FrmField::getAll( array( 'fi.type not' => FrmField::no_save_fields(), 'fi.form_id' => $linked_form ) );
-                            $ldfe = '';
+							$ldfe = '';
 							if ( $linked_fields ) {
 								foreach ( $linked_fields as $linked_field ) {
-                                    FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
-
-                                    $ldfe = $linked_field->id;
-                                    unset($linked_field);
-                                }
-                            }
-                        }
-                    }
-                    $dfe = $f->id;
-        	    }
-                unset($f);
-                }
-            } ?>
+									FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
+
+									$ldfe = $linked_field->id;
+									unset($linked_field);
+								}
+							}
+						}
+					}
+					$dfe = $f->id;
+				}
+				unset($f);
+				}
+			} ?>
         </ul>
 
         <?php _e( 'Helpers', 'formidable' ) ?>:
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $entry_shortcodes as $skey => $sname ) {
 			if ( empty( $skey ) ) {
-                 $col = 'one';
-                 echo '<li class="clear frm_block"></li>';
-                 continue;
-            }
-        ?>
+				 $col = 'one';
+				 echo '<li class="clear frm_block"></li>';
+				 continue;
+			}
+		?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
             <a href="javascript:void(0)" class="frmbutton button <?php
 			echo ( in_array( $skey, array( 'siteurl', 'sitename', 'entry_count' ) ) ) ? 'show_before_content show_after_content' : '';
-            echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
-            ?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
+			echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
+			?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
         </li>
         <?php
-            $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
-        }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 
@@ -99,11 +99,11 @@ 
 	    <ul class="alignleft"><li><?php _e( 'Fields from your form', 'formidable' ) ?>:</li></ul>
 	    <ul class="frm_code_list frm_full_width">
 		    <?php if ( ! empty( $fields ) ) {
-		        foreach ( $fields as $f ) {
+				foreach ( $fields as $f ) {
 					if ( FrmField::is_no_save_field( $f->type ) || ( $f->type == 'data' && ( ! isset( $f->field_options['data_type'] ) || $f->field_options['data_type'] == 'data' || $f->field_options['data_type'] == '' ) ) ) {
-                        continue;
-                }
-            ?>
+						continue;
+				}
+			?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
                 	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
@@ -111,30 +111,30 @@ 
                 </li>
                 <?php
 
-                    if ( $f->type == 'user_id' ) {
-                        $uid = $f;
-                    } else if ( $f->type == 'file' ) {
-                        $file = $f;
-                    }
-        		    unset($f);
-		        }
-		    } ?>
+					if ( $f->type == 'user_id' ) {
+						$uid = $f;
+					} else if ( $f->type == 'file' ) {
+						$file = $f;
+					}
+					unset($f);
+				}
+			} ?>
         </ul>
 
         <p class="howto"><?php _e( 'Click a button below to insert sample logic into your view', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $cond_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
-	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 	<?php } ?>
@@ -142,19 +142,19 @@ 
 	<div id="frm-adv-info-tab" class="tabs-panel">
 		<ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $adv_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 			<a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="x <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>>
 				<?php echo is_array( $sname ) ? $sname['label'] : $sname; ?>
 			</a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         <?php if ( isset($file) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
@@ -171,8 +171,8 @@ 
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
-            $col = 'one'; ?>
+		if ( isset($uid) && ! empty($user_fields) ) {
+			$col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php foreach ( $user_fields as $uk => $uf ) { ?>
@@ -180,14 +180,14 @@ 
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
-        }
-        unset($uid); ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($uf, $uk);
+		}
+		unset($uid); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+		if ( isset($repeat_field) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -196,9 +196,9 @@ 
         	    </li>
             </ul>
         <?php
-        }
+		}
 
-        if ( isset($dfe) ) { ?>
+		if ( isset($dfe) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -217,8 +217,8 @@ 
 	</div>
 
     <?php
-    if ( $settings_tab ) {
+	if ( $settings_tab ) {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/mb_html_tab.php' );
-    }
-    ?>
+	}
+	?>
 </div>

Spacing +24 added lines, -24 removed lines

@@ -42,7 +42,7 @@ 
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
+                    if ( isset( $f->field_options['form_select'] ) && is_numeric( $f->field_options['form_select'] ) ) {
 						$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
                         if ( ! in_array( $linked_form, $linked_forms ) ) {
                             $linked_forms[] = $linked_form;
@@ -53,14 +53,14 @@ 
                                     FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
 
                                     $ldfe = $linked_field->id;
-                                    unset($linked_field);
+                                    unset( $linked_field );
                                 }
                             }
                         }
                     }
                     $dfe = $f->id;
         	    }
-                unset($f);
+                unset( $f );
                 }
             } ?>
         </ul>
@@ -84,7 +84,7 @@ 
         </li>
         <?php
             $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
+            unset( $skey, $sname );
         }
         ?>
         </ul>
@@ -106,8 +106,8 @@ 
             ?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
-                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
-                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr($f->id) ?>"><?php echo FrmAppHelper::truncate($f->name, 60) ?></a>
+                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate( $f->field_key, 10 ) ?>]</a>
+                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr( $f->id ) ?>"><?php echo FrmAppHelper::truncate( $f->name, 60 ) ?></a>
                 </li>
                 <?php
 
@@ -116,7 +116,7 @@ 
                     } else if ( $f->type == 'file' ) {
                         $file = $f;
                     }
-        		    unset($f);
+        		    unset( $f );
 		        }
 		    } ?>
         </ul>
@@ -128,11 +128,11 @@ 
 		foreach ( $cond_shortcodes as $skey => $sname ) {
 	    ?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr( $skey ) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
 	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
+	        unset( $skey, $sname );
 	    }
         ?>
         </ul>
@@ -151,19 +151,19 @@ 
 			</a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
+	        $col = ( $col == 'one' ) ? 'two' : 'one';
+	        unset( $skey, $sname );
 	    }
         ?>
-        <?php if ( isset($file) ) { ?>
+        <?php if ( isset( $file ) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
 	    </li>
-	    <li class="frm_col_<?php echo $col = (($col == 'one') ? 'two' : 'one') ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
+	    <li class="frm_col_<?php echo $col = ( ( $col == 'one' ) ? 'two' : 'one' ) ?>">
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
 	    </li>
-	    <li class="frm_col_<?php echo $col = (($col == 'one') ? 'two' : 'one') ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
+	    <li class="frm_col_<?php echo $col = ( ( $col == 'one' ) ? 'two' : 'one' ) ?>">
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
 	    </li>
 	    <?php } ?>
         </ul>
@@ -171,7 +171,7 @@ 
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
+        if ( isset( $uid ) && ! empty( $user_fields ) ) {
             $col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
@@ -180,14 +180,14 @@ 
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
+            $col = ( $col == 'one' ) ? 'two' : 'one';
+            unset( $uf, $uk );
         }
-        unset($uid); ?>
+        unset( $uid ); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+        if ( isset( $repeat_field ) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -198,7 +198,7 @@ 
         <?php
         }
 
-        if ( isset($dfe) ) { ?>
+        if ( isset( $dfe ) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -206,7 +206,7 @@ 
         	    <li class="frm_col_one">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="created-at"' ) ?>"><?php _e( 'Creation Date', 'formidable' ) ?></a>
         	    </li>
-        	    <?php if ( isset($ldfe) ) { ?>
+        	    <?php if ( isset( $ldfe ) ) { ?>
         	    <li class="frm_col_two">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="' . $ldfe . '"' ) ?>"><?php _e( 'Field From Entry', 'formidable' ) ?></a>
         	    </li>

classes/views/frm-entries/no_entries.php

Spacing +3 added lines, -3 removed lines

@@ -1,13 +1,13 @@
 <div class="frmcenter frm_no_entries_form">
 <?php
-if ( $form && isset($form->options['no_save']) && $form->options['no_save'] ) { ?>
+if ( $form && isset( $form->options['no_save'] ) && $form->options['no_save'] ) { ?>
 <h3><?php _e( 'This form is not set to save any entries.', 'formidable' ) ?></h3>
 <p>If you would like entries in this form to be saved, go to the <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable' ) . '&frm_action=settings&id=' . $form->id ) ?>">form Settings</a> page and uncheck the "Do not store any entries submitted from this form" box.</p>
 <?php
 } else if ( $form ) {
 ?>
-<div class="frm_no_entries_header"><?php printf(__( 'No Entries for form: %s', 'formidable' ), $form->name); ?></div>
-<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url('admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
+<div class="frm_no_entries_header"><?php printf( __( 'No Entries for form: %s', 'formidable' ), $form->name ); ?></div>
+<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
 <?php
 } else {
 ?>