rousnay / lighthouse

includes/acf/fields/user.php

Spacing +95 added lines, -95 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_user') ) :
+if ( ! class_exists('acf_field_user')) :
 
 class acf_field_user extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'user';
-		$this->label = __("User",'acf');
+		$this->label = __("User", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'role' 			=> '',
@@ -43,8 +43,8 @@ 
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/user/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/user/query',	array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/user/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/user/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -66,7 +66,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
    		// defaults
    		$options = acf_parse_args($options, array(
@@ -82,9 +82,9 @@ 
    		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -94,13 +94,13 @@ 
 		// editable roles
 		$editable_roles = get_editable_roles();
 		
-		if( !empty($field['role']) ) {
+		if ( ! empty($field['role'])) {
 			
-			foreach( $editable_roles as $role => $role_info ) {
+			foreach ($editable_roles as $role => $role_info) {
 				
-				if( !in_array($role, $field['role']) ) {
+				if ( ! in_array($role, $field['role'])) {
 				
-					unset( $editable_roles[ $role ] );
+					unset($editable_roles[$role]);
 					
 				}
 				
@@ -110,10 +110,10 @@ 
 		
 				
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 			
 			// append to $args
-			$args['search'] = '*' . $options['s'] . '*';
+			$args['search'] = '*'.$options['s'].'*';
 			
 			
 			// add reference
@@ -127,17 +127,17 @@ 
 		
 		
 		// filters
-		$args = apply_filters("acf/fields/user/query",							$args, $field, $options['post_id']);
-		$args = apply_filters("acf/fields/user/query/name={$field['_name']}",	$args, $field, $options['post_id']);
-		$args = apply_filters("acf/fields/user/query/key={$field['key']}",		$args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query", $args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query/name={$field['_name']}", $args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query/key={$field['key']}", $args, $field, $options['post_id']);
 		
 		
 		// get users
-		$users = get_users( $args );
+		$users = get_users($args);
 		
-		if( !empty($users) && !empty($editable_roles) ) {
+		if ( ! empty($users) && ! empty($editable_roles)) {
 			
-			foreach( $editable_roles as $role => $role_info ) {
+			foreach ($editable_roles as $role => $role_info) {
 				
 				// vars
 				$this_users = array();
@@ -145,16 +145,16 @@ 
 				
 				
 				// loop over users
-				foreach( array_keys($users) as $key ) {
+				foreach (array_keys($users) as $key) {
 					
-					if( in_array($role, $users[ $key ]->roles) ) {
+					if (in_array($role, $users[$key]->roles)) {
 						
 						// extract user
-						$user = acf_extract_var( $users, $key );
+						$user = acf_extract_var($users, $key);
 						
 						
 						// append to $this_users
-						$this_users[ $user->ID ] = $this->get_result( $user, $field, $options['post_id'] );
+						$this_users[$user->ID] = $this->get_result($user, $field, $options['post_id']);
 						
 					}
 					
@@ -162,7 +162,7 @@ 
 				
 				
 				// bail early if no users for this role
-				if( empty($this_users) ) {
+				if (empty($this_users)) {
 				
 					continue;
 					
@@ -170,34 +170,34 @@ 
 				
 								
 				// order by search
-				if( !empty($args['s']) ) {
+				if ( ! empty($args['s'])) {
 					
-					$this_users = acf_order_by_search( $this_users, $args['s'] );
+					$this_users = acf_order_by_search($this_users, $args['s']);
 					
 				}
 				
 				
 				// append to json
-				foreach( array_keys($this_users) as $user_id ) {
+				foreach (array_keys($this_users) as $user_id) {
 					
 					// add to json
 					$this_json[] = array(
 						'id'	=> $user_id,
-						'text'	=> $this_users[ $user_id ]
+						'text'	=> $this_users[$user_id]
 					);
 	
 				}
 				
 				
 				// add as optgroup or results
-				if( count($editable_roles) == 1 ) {
+				if (count($editable_roles) == 1) {
 				
 					$r = $this_json;
 					
 				} else {
 					
 					$r[] = array(
-						'text'		=> translate_user_role( $role_info['name'] ),
+						'text'		=> translate_user_role($role_info['name']),
 						'children'	=> $this_json
 					);
 					
@@ -230,7 +230,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -238,11 +238,11 @@ 
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$choices = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$choices ) {
+		if ( ! $choices) {
 			
 			die();
 			
@@ -250,7 +250,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $choices );
+		echo json_encode($choices);
 		die();
 			
 	}
@@ -271,10 +271,10 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_result( $user, $field, $post_id = 0 ) {
+	function get_result($user, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$post_id = acf_get_setting('form_data/post_id', get_the_ID());
 			
@@ -286,13 +286,13 @@ 
 		
 		
 		// append name
-		if( $user->first_name ) {
+		if ($user->first_name) {
 			
-			$result .= ' (' .  $user->first_name;
+			$result .= ' ('.$user->first_name;
 			
-			if( $user->last_name ) {
+			if ($user->last_name) {
 				
-				$result .= ' ' . $user->last_name;
+				$result .= ' '.$user->last_name;
 				
 			}
 			
@@ -302,9 +302,9 @@ 
 		
 		
 		// filters
-		$result = apply_filters("acf/fields/user/result",							$result, $user, $field, $post_id);
-		$result = apply_filters("acf/fields/user/result/name={$field['_name']}",	$result, $user, $field, $post_id);
-		$result = apply_filters("acf/fields/user/result/key={$field['key']}",		$result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result", $result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result/name={$field['_name']}", $result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result/key={$field['key']}", $result, $user, $field, $post_id);
 		
 		
 		// return
@@ -326,10 +326,10 @@ 
 	*  @return	$columns
 	*/
 	
-	function user_search_columns( $columns, $search, $WP_User_Query ) {
+	function user_search_columns($columns, $search, $WP_User_Query) {
 		
 		// bail early if no field
-		if( empty($this->field) ) {
+		if (empty($this->field)) {
 			
 			return $columns;
 			
@@ -341,9 +341,9 @@ 
 		
 		
 		// filter for 3rd party customization
-		$columns = apply_filters("acf/fields/user/search_columns", 							$columns, $search, $WP_User_Query, $field);
-		$columns = apply_filters("acf/fields/user/search_columns/name={$field['_name']}",	$columns, $search, $WP_User_Query, $field);
-		$columns = apply_filters("acf/fields/user/search_columns/key={$field['key']}",		$columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns", $columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns/name={$field['_name']}", $columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns/key={$field['key']}", $columns, $search, $WP_User_Query, $field);
 		
 		
 		// return
@@ -363,7 +363,7 @@ 
 	*  @param	$field - an array holding all the field's data
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// Change Field into a select
 		$field['type'] = 'select';
@@ -373,10 +373,10 @@ 
 		
 		
 		// populate choices
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			// force value to array
-			$field['value'] = acf_get_array( $field['value'] );
+			$field['value'] = acf_get_array($field['value']);
 			
 			
 			// convert values to int
@@ -388,11 +388,11 @@ 
 			));
 			
 			
-			if( !empty($users) ) {
+			if ( ! empty($users)) {
 			
-				foreach( $users as $user ) {
+				foreach ($users as $user) {
 				
-					$field['choices'][ $user->ID ] = $this->get_result( $user, $field );
+					$field['choices'][$user->ID] = $this->get_result($user, $field);
 					
 				}
 				
@@ -402,7 +402,7 @@ 
 		
 		
 		// render
-		acf_render_field( $field );
+		acf_render_field($field);
 		
 	}
 	
@@ -420,21 +420,21 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// role
 		$choices = array();
 		$editable_roles = get_editable_roles();
 
-		foreach( $editable_roles as $role => $details ) {	
+		foreach ($editable_roles as $role => $details) {	
 				
 			// only translate the output not the value
-			$choices[ $role ] = translate_user_role( $details['name'] );
+			$choices[$role] = translate_user_role($details['name']);
 			
 		}
 		
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by role','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by role', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'role',
@@ -442,34 +442,34 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All user roles",'acf'),
+			'placeholder'	=> __("All user roles", 'acf'),
 		));
 		
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// multiple
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Select multiple values?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Select multiple values?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'multiple',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -494,17 +494,17 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 	
 		// array?
-		if( is_array($value) && isset($value['ID']) ) {
+		if (is_array($value) && isset($value['ID'])) {
 		
 			$value = $value['ID'];	
 			
 		}
 		
 		// object?
-		if( is_object($value) && isset($value->ID) ) {
+		if (is_object($value) && isset($value->ID)) {
 		
 			$value = $value->ID;
 			
@@ -531,10 +531,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// ACF4 null
-		if( $value === 'null' ) {
+		if ($value === 'null') {
 		
 			return false;
 			
@@ -562,10 +562,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 		
 			return $value;
 			
@@ -573,7 +573,7 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// convert values to int
@@ -581,41 +581,41 @@ 
 		
 		
 		// load users	
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
 			// vars
-			$user_id = $value[ $i ];
-			$user_data = get_userdata( $user_id );
+			$user_id = $value[$i];
+			$user_data = get_userdata($user_id);
 			
 			
 			//cope with deleted users by @adampope
-			if( !is_object($user_data) ) {
+			if ( ! is_object($user_data)) {
 			
-				unset( $value[ $i ] );
+				unset($value[$i]);
 				continue;
 				
 			}
 	
 			
 			// append to array
-			$value[ $i ] = array();
-			$value[ $i ]['ID'] = $user_id;
-			$value[ $i ]['user_firstname'] = $user_data->user_firstname;
-			$value[ $i ]['user_lastname'] = $user_data->user_lastname;
-			$value[ $i ]['nickname'] = $user_data->nickname;
-			$value[ $i ]['user_nicename'] = $user_data->user_nicename;
-			$value[ $i ]['display_name'] = $user_data->display_name;
-			$value[ $i ]['user_email'] = $user_data->user_email;
-			$value[ $i ]['user_url'] = $user_data->user_url;
-			$value[ $i ]['user_registered'] = $user_data->user_registered;
-			$value[ $i ]['user_description'] = $user_data->user_description;
-			$value[ $i ]['user_avatar'] = get_avatar( $user_id );
+			$value[$i] = array();
+			$value[$i]['ID'] = $user_id;
+			$value[$i]['user_firstname'] = $user_data->user_firstname;
+			$value[$i]['user_lastname'] = $user_data->user_lastname;
+			$value[$i]['nickname'] = $user_data->nickname;
+			$value[$i]['user_nicename'] = $user_data->user_nicename;
+			$value[$i]['display_name'] = $user_data->display_name;
+			$value[$i]['user_email'] = $user_data->user_email;
+			$value[$i]['user_url'] = $user_data->user_url;
+			$value[$i]['user_registered'] = $user_data->user_registered;
+			$value[$i]['user_description'] = $user_data->user_description;
+			$value[$i]['user_avatar'] = get_avatar($user_id);
 			
 		}
 		
 		
 		// convert back from array if neccessary
-		if( !$field['multiple'] ) {
+		if ( ! $field['multiple']) {
 		
 			$value = array_shift($value);
 			

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
 	}
 		
 	

includes/acf/fields/wysiwyg.php

Indentation +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		);
     	
     	
-    	// Create an acf version of the_content filter (acf_the_content)
+		// Create an acf version of the_content filter (acf_the_content)
 		if(	!empty($GLOBALS['wp_embed']) ) {
 		
 			add_filter( 'acf_the_content', array( $GLOBALS['wp_embed'], 'run_shortcode' ), 8 );
@@ -73,7 +73,7 @@ 
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
     	
 	}
 	

Spacing +69 added lines, -69 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_wysiwyg') ) :
+if ( ! class_exists('acf_field_wysiwyg')) :
 
 class acf_field_wysiwyg extends acf_field {
 	
@@ -34,7 +34,7 @@ 
 		
 		// vars
 		$this->name = 'wysiwyg';
-		$this->label = __("Wysiwyg Editor",'acf');
+		$this->label = __("Wysiwyg Editor", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'tabs'			=> 'all',
@@ -45,31 +45,31 @@ 
     	
     	
     	// Create an acf version of the_content filter (acf_the_content)
-		if(	!empty($GLOBALS['wp_embed']) ) {
+		if ( ! empty($GLOBALS['wp_embed'])) {
 		
-			add_filter( 'acf_the_content', array( $GLOBALS['wp_embed'], 'run_shortcode' ), 8 );
-			add_filter( 'acf_the_content', array( $GLOBALS['wp_embed'], 'autoembed' ), 8 );
+			add_filter('acf_the_content', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
+			add_filter('acf_the_content', array($GLOBALS['wp_embed'], 'autoembed'), 8);
 			
 		}
 		
-		add_filter( 'acf_the_content', 'capital_P_dangit', 11 );
-		add_filter( 'acf_the_content', 'wptexturize' );
-		add_filter( 'acf_the_content', 'convert_smilies' );
-		add_filter( 'acf_the_content', 'convert_chars' ); // not found in WP 4.4
-		add_filter( 'acf_the_content', 'wpautop' );
-		add_filter( 'acf_the_content', 'shortcode_unautop' );
+		add_filter('acf_the_content', 'capital_P_dangit', 11);
+		add_filter('acf_the_content', 'wptexturize');
+		add_filter('acf_the_content', 'convert_smilies');
+		add_filter('acf_the_content', 'convert_chars'); // not found in WP 4.4
+		add_filter('acf_the_content', 'wpautop');
+		add_filter('acf_the_content', 'shortcode_unautop');
 		//add_filter( 'acf_the_content', 'prepend_attachment' ); should only be for the_content (causes double image on attachment page)
-		if( function_exists('wp_make_content_images_responsive') ) {
+		if (function_exists('wp_make_content_images_responsive')) {
 			
-			add_filter( 'acf_the_content', 'wp_make_content_images_responsive' ); // added in WP 4.4
+			add_filter('acf_the_content', 'wp_make_content_images_responsive'); // added in WP 4.4
 			
 		}
 		
-		add_filter( 'acf_the_content', 'do_shortcode', 11);
+		add_filter('acf_the_content', 'do_shortcode', 11);
 		
 
 		// actions
-		add_action('acf/input/admin_footer_js', 	array($this, 'input_admin_footer_js'));
+		add_action('acf/input/admin_footer_js', array($this, 'input_admin_footer_js'));
 		
 		
 		// do not delete!
@@ -102,14 +102,14 @@ 
    		$editor_id = 'acf_content';
    		
    		
-   		if( version_compare($wp_version, '3.9', '>=' ) ) {
+   		if (version_compare($wp_version, '3.9', '>=')) {
    		
    			// Full
 	   		$toolbars['Full'] = array(
 	   			
-	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id),
+	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv'), $editor_id),
 	   			
-	   			2 => apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id),
+	   			2 => apply_filters('mce_buttons_2', array('formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help'), $editor_id),
 	   			
 	   			3 => apply_filters('mce_buttons_3', array(), $editor_id),
 	   			
@@ -130,9 +130,9 @@ 
 	   		// Full
 	   		$toolbars['Full'] = array(
 	   			
-	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id),
+	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv'), $editor_id),
 	   			
-	   			2 => apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id),
+	   			2 => apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help'), $editor_id),
 	   			
 	   			3 => apply_filters('mce_buttons_3', array(), $editor_id),
 	   			
@@ -144,7 +144,7 @@ 
 	   		// Basic
 	   		$toolbars['Basic'] = array(
 	   			
-	   			1 => apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id ),
+	   			1 => apply_filters('teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id),
 	   			
 	   		);
 	   		
@@ -152,7 +152,7 @@ 
    		
    		
    		// Filter for 3rd party
-   		$toolbars = apply_filters( 'acf/fields/wysiwyg/toolbars', $toolbars );
+   		$toolbars = apply_filters('acf/fields/wysiwyg/toolbars', $toolbars);
    		
    		
    		// return
@@ -182,7 +182,7 @@ 
 
 		
 		// bail ealry if no toolbars
-		if( empty($toolbars) ) {
+		if (empty($toolbars)) {
 			
 			return;
 			
@@ -190,23 +190,23 @@ 
 		
 			
 		// loop through toolbars
-		foreach( $toolbars as $label => $rows ) {
+		foreach ($toolbars as $label => $rows) {
 			
 			// vars
-			$label = sanitize_title( $label );
+			$label = sanitize_title($label);
 			$label = str_replace('-', '_', $label);
 			
 			
 			// append to $json
-			$json[ $label ] = array();
+			$json[$label] = array();
 			
 			
 			// convert to strings
-			if( !empty($rows) ) {
+			if ( ! empty($rows)) {
 				
-				foreach( $rows as $i => $row ) { 
+				foreach ($rows as $i => $row) { 
 					
-					$json[ $label ][ $i ] = implode(',', $row);
+					$json[$label][$i] = implode(',', $row);
 					
 				}
 				
@@ -233,7 +233,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// global
    		global $wp_version;
@@ -252,22 +252,22 @@ 
 		
 		// get height
 		$height = acf_get_user_setting('wysiwyg_height', 300);
-		$height = max( $height, 300 ); // minimum height is 300
+		$height = max($height, 300); // minimum height is 300
 		
 		
 		// detect mode
-		if( $field['tabs'] == 'visual' ) {
+		if ($field['tabs'] == 'visual') {
 			
 			// case: visual tab only
 			$default_editor = 'tinymce';
 			$show_tabs = false;
 			
-		} elseif( $field['tabs'] == 'text' ) {
+		} elseif ($field['tabs'] == 'text') {
 			
 			// case: text tab only
 			$show_tabs = false;
 			
-		} elseif( wp_default_editor() == 'tinymce' ) {
+		} elseif (wp_default_editor() == 'tinymce') {
 			
 			// case: both tabs
 			$default_editor = 'tinymce';
@@ -276,7 +276,7 @@ 
 		
 		
 		// must be logged in tp upload
-		if( !current_user_can('upload_files') ) {
+		if ( ! current_user_can('upload_files')) {
 			
 			$field['media_upload'] = 0;
 			
@@ -288,17 +288,17 @@ 
 		
 		
 		// filter value for editor
-		remove_filter( 'acf_the_editor_content', 'format_for_editor', 10, 2 );
-		remove_filter( 'acf_the_editor_content', 'wp_htmledit_pre', 10, 1 );
-		remove_filter( 'acf_the_editor_content', 'wp_richedit_pre', 10, 1 );
+		remove_filter('acf_the_editor_content', 'format_for_editor', 10, 2);
+		remove_filter('acf_the_editor_content', 'wp_htmledit_pre', 10, 1);
+		remove_filter('acf_the_editor_content', 'wp_richedit_pre', 10, 1);
 		
 		
 		// WP 4.3
-		if( version_compare($wp_version, '4.3', '>=' ) ) {
+		if (version_compare($wp_version, '4.3', '>=')) {
 			
-			add_filter( 'acf_the_editor_content', 'format_for_editor', 10, 2 );
+			add_filter('acf_the_editor_content', 'format_for_editor', 10, 2);
 			
-			$button = 'data-wp-editor-id="' . $id . '"';
+			$button = 'data-wp-editor-id="'.$id.'"';
 			
 		// WP < 4.3
 		} else {
@@ -313,25 +313,25 @@ 
 		
 		
 		// filter
-		$field['value'] = apply_filters( 'acf_the_editor_content', $field['value'], $default_editor );
+		$field['value'] = apply_filters('acf_the_editor_content', $field['value'], $default_editor);
 		
 		?>
 		<div id="wp-<?php echo $id; ?>-wrap" class="acf-editor-wrap wp-core-ui wp-editor-wrap <?php echo $switch_class; ?>" data-toolbar="<?php echo $field['toolbar']; ?>" data-upload="<?php echo $field['media_upload']; ?>">
 			<div id="wp-<?php echo $id; ?>-editor-tools" class="wp-editor-tools hide-if-no-js">
-				<?php if( $field['media_upload'] ): ?>
+				<?php if ($field['media_upload']): ?>
 				<div id="wp-<?php echo $id; ?>-media-buttons" class="wp-media-buttons">
-					<?php do_action( 'media_buttons', $id ); ?>
+					<?php do_action('media_buttons', $id); ?>
 				</div>
 				<?php endif; ?>
-				<?php if( user_can_richedit() && $show_tabs ): ?>
+				<?php if (user_can_richedit() && $show_tabs): ?>
 					<div class="wp-editor-tabs">
 						<button id="<?php echo $id; ?>-tmce" class="wp-switch-editor switch-tmce" <?php echo  $button; ?> type="button"><?php echo __('Visual', 'acf'); ?></button>
-						<button id="<?php echo $id; ?>-html" class="wp-switch-editor switch-html" <?php echo  $button; ?> type="button"><?php echo _x( 'Text', 'Name for the Text editor tab (formerly HTML)', 'acf' ); ?></button>
+						<button id="<?php echo $id; ?>-html" class="wp-switch-editor switch-html" <?php echo  $button; ?> type="button"><?php echo _x('Text', 'Name for the Text editor tab (formerly HTML)', 'acf'); ?></button>
 					</div>
 				<?php endif; ?>
 			</div>
 			<div id="wp-<?php echo $id; ?>-editor-container" class="wp-editor-container">
-				<textarea id="<?php echo $id; ?>" class="wp-editor-area" name="<?php echo $field['name']; ?>" <?php if($height): ?>style="height:<?php echo $height; ?>px;"<?php endif; ?>><?php echo $field['value']; ?></textarea>
+				<textarea id="<?php echo $id; ?>" class="wp-editor-area" name="<?php echo $field['name']; ?>" <?php if ($height): ?>style="height:<?php echo $height; ?>px;"<?php endif; ?>><?php echo $field['value']; ?></textarea>
 			</div>
 		</div>
 		<?php
@@ -352,51 +352,51 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// vars
 		$toolbars = $this->get_toolbars();
 		$choices = array();
 		
-		if( !empty($toolbars) ) {
+		if ( ! empty($toolbars)) {
 		
-			foreach( $toolbars as $k => $v ) {
+			foreach ($toolbars as $k => $v) {
 				
 				$label = $k;
-				$name = sanitize_title( $label );
+				$name = sanitize_title($label);
 				$name = str_replace('-', '_', $name);
 				
-				$choices[ $name ] = $label;
+				$choices[$name] = $label;
 			}
 		}
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// tabs
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Tabs','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Tabs', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'tabs',
 			'choices'		=> array(
-				'all'			=>	__("Visual & Text",'acf'),
-				'visual'		=>	__("Visual Only",'acf'),
-				'text'			=>	__("Text Only",'acf'),
+				'all'			=>	__("Visual & Text", 'acf'),
+				'visual'		=>	__("Visual Only", 'acf'),
+				'text'			=>	__("Text Only", 'acf'),
 			)
 		));
 		
 		
 		// toolbar
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Toolbar','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Toolbar', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'toolbar',
@@ -405,15 +405,15 @@ 
 		
 		
 		// media_upload
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Show Media Upload Buttons?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Show Media Upload Buttons?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'media_upload',
 			'layout'		=> 'horizontal',
 			'choices'		=> array(
-				1				=>	__("Yes",'acf'),
-				0				=>	__("No",'acf'),
+				1				=>	__("Yes", 'acf'),
+				0				=>	__("No", 'acf'),
 			)
 		));
 
@@ -436,10 +436,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 		
@@ -447,7 +447,7 @@ 
 		
 		
 		// apply filters
-		$value = apply_filters( 'acf_the_content', $value );
+		$value = apply_filters('acf_the_content', $value);
 		
 		
 		// follow the_content function in /wp-includes/post-template.php

includes/acf/forms/attachment.php

Indentation +3 added lines, -3 removed lines

@@ -247,7 +247,7 @@ 
 			
 			
 			$form_fields[ 'acf-form-data' ] = array(
-	       		'label' => '',
+		   		'label' => '',
 	   			'input' => 'html',
 	   			'html' => $html
 			);
@@ -284,8 +284,8 @@ 
 		}
 		
 	    
-	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+		// validate and save
+		if( acf_validate_save_post(true) ) {
 	    
 			acf_save_post( $post['ID'] );
 			

Spacing +20 added lines, -20 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_attachment') ) :
+if ( ! class_exists('acf_form_attachment')) :
 
 class acf_form_attachment {
 	
@@ -31,15 +31,15 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',			array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// render
-		add_filter('attachment_fields_to_edit', 	array($this, 'edit_attachment'), 10, 2);
+		add_filter('attachment_fields_to_edit', array($this, 'edit_attachment'), 10, 2);
 		
 		
 		// save
-		add_filter('attachment_fields_to_save', 	array($this, 'save_attachment'), 10, 2);
+		add_filter('attachment_fields_to_save', array($this, 'save_attachment'), 10, 2);
 		
 	}
 	
@@ -64,7 +64,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow === 'post.php' && $typenow === 'attachment' ) {
+		if ($pagenow === 'post.php' && $typenow === 'attachment') {
 			
 			return true;
 			
@@ -72,7 +72,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow === 'upload.php' && version_compare($wp_version, '4.0', '>=') ) {
+		if ($pagenow === 'upload.php' && version_compare($wp_version, '4.0', '>=')) {
 			
 			add_action('admin_footer', array($this, 'admin_footer'), 0);
 			
@@ -103,7 +103,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// bail early if not valid page
-		if( !$this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 			
 			return;
 			
@@ -154,7 +154,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_attachment( $form_fields, $post ) {
+	function edit_attachment($form_fields, $post) {
 		
 		// vars
 		$el = 'tr';
@@ -165,18 +165,18 @@ 
 		
 		
 		// $el
-		if( $this->validate_page() ) {
+		if ($this->validate_page()) {
 			
 			//$el = 'div';
 			
 		}
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// get acf_form_data
 			ob_start();
@@ -188,7 +188,7 @@ 
 			));
 			
 			
-			if( $this->validate_page() ) {
+			if ($this->validate_page()) {
 				
 				echo '<style type="text/css">
 					.compat-attachment-fields,
@@ -223,11 +223,11 @@ 
 			//}
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
-				acf_render_fields( $post_id, $fields, $el, 'field' );
+				acf_render_fields($post_id, $fields, $el, 'field');
 				
 			}
 			
@@ -246,7 +246,7 @@ 
 			ob_end_clean();
 			
 			
-			$form_fields[ 'acf-form-data' ] = array(
+			$form_fields['acf-form-data'] = array(
 	       		'label' => '',
 	   			'input' => 'html',
 	   			'html' => $html
@@ -274,10 +274,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_attachment( $post, $attachment ) {
+	function save_attachment($post, $attachment) {
 		
 		// bail early if not valid nonce
-		if( ! acf_verify_nonce('attachment') ) {
+		if ( ! acf_verify_nonce('attachment')) {
 		
 			return $post;
 			
@@ -285,9 +285,9 @@ 
 		
 	    
 	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
-			acf_save_post( $post['ID'] );
+			acf_save_post($post['ID']);
 			
 		}
 		

includes/acf/forms/comment.php

Indentation +2 added lines, -2 removed lines

@@ -258,8 +258,8 @@
 		}
 		
 	    
-	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+		// validate and save
+		if( acf_validate_save_post(true) ) {
 	    
 			acf_save_post( "comment_{$comment_id}" );	
 			

Spacing +24 added lines, -24 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_comment') ) :
+if ( ! class_exists('acf_form_comment')) :
 
 class acf_form_comment {
 	
@@ -31,17 +31,17 @@ 
 	function __construct() {
 		
 		// actions
-		add_action( 'admin_enqueue_scripts',			array( $this, 'admin_enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// render
-		add_action( 'comment_form_logged_in_after',		array( $this, 'add_comment') );
-		add_action( 'comment_form_after_fields',		array( $this, 'add_comment') );
+		add_action('comment_form_logged_in_after', array($this, 'add_comment'));
+		add_action('comment_form_after_fields', array($this, 'add_comment'));
 
 		
 		// save
-		add_action( 'edit_comment', 					array( $this, 'save_comment' ), 10, 1 );
-		add_action( 'comment_post', 					array( $this, 'save_comment' ), 10, 1 );
+		add_action('edit_comment', array($this, 'save_comment'), 10, 1);
+		add_action('comment_post', array($this, 'save_comment'), 10, 1);
 		
 	}
 	
@@ -66,7 +66,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow == 'comment.php' ) {
+		if ($pagenow == 'comment.php') {
 			
 			return true;
 			
@@ -95,7 +95,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( ! $this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 		
 			return;
 			
@@ -107,8 +107,8 @@ 
 		
 		
 		// actions
-		add_action('admin_footer',				array($this, 'admin_footer'), 10, 1);
-		add_action('add_meta_boxes_comment', 	array($this, 'edit_comment'), 10, 1);
+		add_action('admin_footer', array($this, 'admin_footer'), 10, 1);
+		add_action('add_meta_boxes_comment', array($this, 'edit_comment'), 10, 1);
 
 	}
 	
@@ -126,7 +126,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function edit_comment( $comment ) {
+	function edit_comment($comment) {
 		
 		// vars
 		$post_id = "comment_{$comment->comment_ID}";
@@ -139,7 +139,7 @@ 
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 		
 			// render post data
 			acf_form_data(array( 
@@ -148,15 +148,15 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
 				// load fields
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				
 				// vars
 				$o = array(
-					'id'			=> 'acf-' . $field_group['ID'],
+					'id'			=> 'acf-'.$field_group['ID'],
 					'key'			=> $field_group['key'],
 					'label'			=> $field_group['label_placement']
 				);
@@ -165,7 +165,7 @@ 
 				<div id="acf-<?php echo $field_group['ID']; ?>" class="stuffbox">
 					<h3 class="hndle"><?php echo $field_group['title']; ?></h3>
 					<div class="inside">
-						<?php acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] ); ?>
+						<?php acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']); ?>
 						<script type="text/javascript">
 						if( typeof acf !== 'undefined' ) {
 								
@@ -209,7 +209,7 @@ 
 		));
 		
 		
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// render post data
 			acf_form_data(array( 
@@ -218,13 +218,13 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				?>
 				<div class="acf-fields -<?php echo $field_group['label_placement']; ?>">
-					<?php acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] ); ?>
+					<?php acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']); ?>
 				</div>
 				<?php
 				
@@ -248,10 +248,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function save_comment( $comment_id ) {
+	function save_comment($comment_id) {
 		
 		// bail early if not valid nonce
-		if( ! acf_verify_nonce('comment') ) {
+		if ( ! acf_verify_nonce('comment')) {
 		
 			return $comment_id;
 			
@@ -259,9 +259,9 @@ 
 		
 	    
 	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
-			acf_save_post( "comment_{$comment_id}" );	
+			acf_save_post("comment_{$comment_id}");	
 			
 		}
 				

includes/acf/forms/post.php

Spacing +62 added lines, -62 removed lines

@@ -10,13 +10,13 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_post') ) :
+if ( ! class_exists('acf_form_post')) :
 
 class acf_form_post {
 	
-	var $post_id	= 0,
-		$typenow	= '',
-		$style		= '';
+	var $post_id = 0,
+		$typenow = '',
+		$style = '';
 	
 	
 	/*
@@ -35,16 +35,16 @@ 
 	function __construct() {
 	
 		// actions
-		add_action('admin_enqueue_scripts',				array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// save
-		add_filter('wp_insert_post_empty_content',		array($this, 'wp_insert_post_empty_content'), 10, 2);
-		add_action('save_post', 						array($this, 'save_post'), 10, 2);
+		add_filter('wp_insert_post_empty_content', array($this, 'wp_insert_post_empty_content'), 10, 2);
+		add_action('save_post', array($this, 'save_post'), 10, 2);
 		
 		
 		// ajax
-		add_action('wp_ajax_acf/post/get_field_groups',	array($this, 'get_field_groups'));
+		add_action('wp_ajax_acf/post/get_field_groups', array($this, 'get_field_groups'));
 		
 	}
 	
@@ -73,7 +73,7 @@ 
 		
 		
 		// validate page
-		if( in_array($pagenow, array('post.php', 'post-new.php')) ) {
+		if (in_array($pagenow, array('post.php', 'post-new.php'))) {
 			
 			$return = true;
 			
@@ -81,7 +81,7 @@ 
 		
 		
 		// update vars
-		if( !empty($post) ) {
+		if ( ! empty($post)) {
 		
 			$this->post_id = $post->ID;
 			$this->typenow = $typenow;
@@ -90,7 +90,7 @@ 
 		
 		
 		// validate post type
-		if( in_array($typenow, array('acf-field-group', 'attachment')) ) {
+		if (in_array($typenow, array('acf-field-group', 'attachment'))) {
 			
 			return false;
 			
@@ -98,11 +98,11 @@ 
 		
 		
 		// validate page (Shopp)
-		if( $pagenow == "admin.php" && isset( $_GET['page'] ) && $_GET['page'] == "shopp-products" && isset( $_GET['id'] ) ) {
+		if ($pagenow == "admin.php" && isset($_GET['page']) && $_GET['page'] == "shopp-products" && isset($_GET['id'])) {
 			
 			$return = true;
 			
-			$this->post_id = absint( $_GET['id'] );
+			$this->post_id = absint($_GET['id']);
 			$this->typenow = 'shopp_product';
 			
 		}
@@ -130,7 +130,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( !$this->validate_page() ) return;
+		if ( ! $this->validate_page()) return;
 
 		
 		// load acf scripts
@@ -138,8 +138,8 @@ 
 		
 		
 		// actions
-		add_action('acf/input/admin_head',		array($this,'admin_head'));
-		add_action('acf/input/admin_footer',	array($this,'admin_footer'));
+		add_action('acf/input/admin_head', array($this, 'admin_head'));
+		add_action('acf/input/admin_footer', array($this, 'admin_footer'));
 	}
 	
 	
@@ -167,9 +167,9 @@ 
 		
 		
 		// add meta boxes
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
-			foreach( $field_groups as $i => $field_group ) {
+			foreach ($field_groups as $i => $field_group) {
 				
 				// vars
 				$id = "acf-{$field_group['key']}";
@@ -183,7 +183,7 @@ 
 				
 				
 				// tweaks to vars
-				if( $context == 'side' ) {
+				if ($context == 'side') {
 					
 					$priority = 'core';
 				
@@ -195,22 +195,22 @@ 
 				
 				
 				// visibility
-				$args['visibility'] = acf_get_field_group_visibility( $field_group, array(
+				$args['visibility'] = acf_get_field_group_visibility($field_group, array(
 					'post_id'	=> $this->post_id, 
 					'post_type'	=> $this->typenow
 				));
 				
 				
 				// add meta box
-				add_meta_box( $id, $title, array($this, 'render_meta_box'), $this->typenow, $context, $priority, $args );
+				add_meta_box($id, $title, array($this, 'render_meta_box'), $this->typenow, $context, $priority, $args);
 				
 				
 				// update style
-				if( !$style_found && $args['visibility'] ) {
+				if ( ! $style_found && $args['visibility']) {
 					
 					$style_found = true;
 					
-					$this->style = acf_get_field_group_style( $field_group );
+					$this->style = acf_get_field_group_style($field_group);
 					
 				}
 				
@@ -255,11 +255,11 @@ 
 		
 		
 		// render
-		do_meta_boxes( get_current_screen(), 'acf_after_title', $post);
+		do_meta_boxes(get_current_screen(), 'acf_after_title', $post);
 		
 		
 		// clean up
-		unset( $wp_meta_boxes['post']['acf_after_title'] );
+		unset($wp_meta_boxes['post']['acf_after_title']);
 
 	}
 	
@@ -277,11 +277,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function render_meta_box( $post, $args ) {
+	function render_meta_box($post, $args) {
 		
 		// extract args
-		extract( $args ); // all variables from the add_meta_box function
-		extract( $args ); // all variables from the args argument
+		extract($args); // all variables from the add_meta_box function
+		extract($args); // all variables from the args argument
 		
 		
 		// vars
@@ -297,22 +297,22 @@ 
 		
 		
 		// edit_url
-		if( $field_group['ID'] && acf_current_user_can_admin() ) {
+		if ($field_group['ID'] && acf_current_user_can_admin()) {
 			
-			$o['edit_url'] = admin_url('post.php?post=' . $field_group['ID'] . '&action=edit');
+			$o['edit_url'] = admin_url('post.php?post='.$field_group['ID'].'&action=edit');
 				
 		}
 		
 			
 		// load and render fields	
-		if( $visibility ) {
+		if ($visibility) {
 			
 			// load fields
-			$fields = acf_get_fields( $field_group );
+			$fields = acf_get_fields($field_group);
 			
 			
 			// render
-			acf_render_fields( $this->post_id, $fields, 'div', $field_group['instruction_placement'] );
+			acf_render_fields($this->post_id, $fields, 'div', $field_group['instruction_placement']);
 		
 		// render replace-me div
 		} else {
@@ -347,10 +347,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function admin_footer(){
+	function admin_footer() {
 		
 		// get style of first field group
-		echo '<style type="text/css" id="acf-style">' . $this->style . '</style>';
+		echo '<style type="text/css" id="acf-style">'.$this->style.'</style>';
 		
 	}
 	
@@ -381,12 +381,12 @@ 
 		
 		// vars
 		$json = array();
-		$nonce = acf_extract_var( $options, 'nonce' );
-		$exists = acf_extract_var( $options, 'exists' );
+		$nonce = acf_extract_var($options, 'nonce');
+		$exists = acf_extract_var($options, 'exists');
 		
 		
 		// verify nonce
-		if( !wp_verify_nonce($nonce, 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($nonce, 'acf_nonce')) {
 		
 			die;
 			
@@ -394,19 +394,19 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $options );
+		$field_groups = acf_get_field_groups($options);
 		
 		
 		// bail early if no field groups
-		if( empty($field_groups) ) {
+		if (empty($field_groups)) {
 			
-			wp_send_json_success( $json );
+			wp_send_json_success($json);
 			
 		}
 		
 		
 		// loop through field groups
-		foreach( $field_groups as $i => $field_group ) {
+		foreach ($field_groups as $i => $field_group) {
 			
 			// vars
 			$item = array(
@@ -419,18 +419,18 @@ 
 			
 			
 			// style
-			if( $i == 0 ) {
+			if ($i == 0) {
 				
-				$item['style'] = acf_get_field_group_style( $field_group );
+				$item['style'] = acf_get_field_group_style($field_group);
 				
 			}
 			
 			
 			// html
-			if( !in_array($field_group['key'], $exists) ) {
+			if ( ! in_array($field_group['key'], $exists)) {
 				
 				// load fields
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 
 	
 				// get field HTML
@@ -438,7 +438,7 @@ 
 				
 				
 				// render
-				acf_render_fields( $options['post_id'], $fields, 'div', $field_group['instruction_placement'] );
+				acf_render_fields($options['post_id'], $fields, 'div', $field_group['instruction_placement']);
 				
 				
 				$item['html'] = ob_get_clean();
@@ -454,7 +454,7 @@ 
 		
 		
 		// return
-		wp_send_json_success( $json );
+		wp_send_json_success($json);
 		
 	}
 	
@@ -473,9 +473,9 @@ 
 	*  @return	$maybe_empty
 	*/
 	
-	function wp_insert_post_empty_content( $maybe_empty, $postarr ) {
+	function wp_insert_post_empty_content($maybe_empty, $postarr) {
 		
-		if( $maybe_empty && !empty($_POST['_acfchanged']) ) {
+		if ($maybe_empty && ! empty($_POST['_acfchanged'])) {
 			
 			$maybe_empty = false;
 			
@@ -500,10 +500,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_post( $post_id, $post ) {
+	function save_post($post_id, $post) {
 		
 		// do not save if this is an auto save routine
-		if( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 			
 			return $post_id;
 			
@@ -511,7 +511,7 @@ 
 		
 		
 		// bail early if is acf-field-group or acf-field
-		if( in_array($post->post_type, array('acf-field', 'acf-field-group'))) {
+		if (in_array($post->post_type, array('acf-field', 'acf-field-group'))) {
 			
 			return $post_id;
 			
@@ -519,7 +519,7 @@ 
 		
 		
 		// verify and remove nonce
-		if( !acf_verify_nonce('post', $post_id) ) {
+		if ( ! acf_verify_nonce('post', $post_id)) {
 			
 			return $post_id;
 			
@@ -527,17 +527,17 @@ 
 		
 		
 		// validate and save
-		if( get_post_status($post_id) == 'publish' ) {
+		if (get_post_status($post_id) == 'publish') {
 			
-			if( acf_validate_save_post(true) ) {
+			if (acf_validate_save_post(true)) {
 				
-				acf_save_post( $post_id );
+				acf_save_post($post_id);
 				
 			}
 			
 		} else {
 			
-			acf_save_post( $post_id );
+			acf_save_post($post_id);
 			
 		}
 		
@@ -562,14 +562,14 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function is_protected_meta( $protected, $meta_key, $meta_type ) {
+	function is_protected_meta($protected, $meta_key, $meta_type) {
 		
 		// if acf_get_field_reference returns a valid key, this is an acf value, so protect it!
-		if( !$protected ) {
+		if ( ! $protected) {
 			
-			$reference = acf_get_field_reference( $meta_key, $this->post_id );
+			$reference = acf_get_field_reference($meta_key, $this->post_id);
 			
-			if( acf_is_field_key($reference) ) {
+			if (acf_is_field_key($reference)) {
 				
 				$protected = true;
 				

Braces +3 added lines, -1 removed lines

@@ -130,7 +130,9 @@
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( !$this->validate_page() ) return;
+		if( !$this->validate_page() ) {
+			return;
+		}
 
 		
 		// load acf scripts

includes/acf/forms/taxonomy.php

Indentation +2 added lines, -2 removed lines

@@ -395,8 +395,8 @@
 		
 		
 	    
-	    // save data
-	    if( acf_validate_save_post(true) ) {
+		// save data
+		if( acf_validate_save_post(true) ) {
 	    
 			acf_save_post("{$taxonomy}_{$term_id}");
 		

Spacing +29 added lines, -29 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_taxonomy') ) :
+if ( ! class_exists('acf_form_taxonomy')) :
 
 class acf_form_taxonomy {
 	
@@ -33,16 +33,16 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',	array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// save
-		add_action('create_term',			array($this, 'save_term'), 10, 3);
-		add_action('edit_term',				array($this, 'save_term'), 10, 3);
+		add_action('create_term', array($this, 'save_term'), 10, 3);
+		add_action('edit_term', array($this, 'save_term'), 10, 3);
 		
 		
 		// delete
-		add_action('delete_term',			array($this, 'delete_term'), 10, 4);
+		add_action('delete_term', array($this, 'delete_term'), 10, 4);
 		
 	}
 	
@@ -67,7 +67,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow == 'edit-tags.php' ) {
+		if ($pagenow == 'edit-tags.php') {
 			
 			return true;
 			
@@ -96,7 +96,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( !$this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 			
 			return;
 			
@@ -113,9 +113,9 @@ 
 		
 		
 		// actions
-		add_action('admin_footer',					array($this, 'admin_footer'), 10, 1);
-		add_action("{$taxonomy}_add_form_fields", 	array($this, 'add_term'), 10, 1);
-		add_action("{$taxonomy}_edit_form", 		array($this, 'edit_term'), 10, 2);
+		add_action('admin_footer', array($this, 'admin_footer'), 10, 1);
+		add_action("{$taxonomy}_add_form_fields", array($this, 'add_term'), 10, 1);
+		add_action("{$taxonomy}_edit_form", array($this, 'edit_term'), 10, 2);
 		
 	}
 	
@@ -133,7 +133,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function add_term( $taxonomy ) {
+	function add_term($taxonomy) {
 		
 		// vars
 		$post_id = "{$taxonomy}_0";
@@ -147,22 +147,22 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			acf_form_data(array( 
 				'post_id'	=> $post_id, 
 				'nonce'		=> 'taxonomy',
 			));
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 
-				acf_render_fields( $post_id, $fields, 'div', 'field' );
+				acf_render_fields($post_id, $fields, 'div', 'field');
 				
 			}
 			
@@ -184,7 +184,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_term( $term, $taxonomy ) {
+	function edit_term($term, $taxonomy) {
 		
 		// vars
 		$post_id = "{$taxonomy}_{$term->term_id}";
@@ -198,28 +198,28 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			acf_form_data(array( 
 				'post_id'	=> $post_id, 
 				'nonce'		=> 'taxonomy' 
 			));
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				?>
-				<?php if( $field_group['style'] == 'default' ): ?>
+				<?php if ($field_group['style'] == 'default'): ?>
 					<h3><?php echo $field_group['title']; ?></h3>
 				<?php endif; ?>
 				<table class="form-table">
 					<tbody>
-						<?php acf_render_fields( $post_id, $fields, 'tr', 'field' ); ?>
+						<?php acf_render_fields($post_id, $fields, 'tr', 'field'); ?>
 					</tbody>
 				</table>
 				<?php 
@@ -271,7 +271,7 @@ 
 	acf.validation.error_class = 'form-invalid';
 		
 		
-<?php if( $this->form == '#addtag' ): ?>
+<?php if ($this->form == '#addtag'): ?>
 
 	// store origional HTML
 	var $orig = $('#addtag').children('.acf-field').clone();
@@ -384,10 +384,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_term( $term_id, $tt_id, $taxonomy ) {
+	function save_term($term_id, $tt_id, $taxonomy) {
 		
 		// verify and remove nonce
-		if( ! acf_verify_nonce('taxonomy') ) {
+		if ( ! acf_verify_nonce('taxonomy')) {
 			
 			return $term_id;
 		
@@ -396,7 +396,7 @@ 
 		
 	    
 	    // save data
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
 			acf_save_post("{$taxonomy}_{$term_id}");
 		
@@ -418,13 +418,13 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
+	function delete_term($term, $tt_id, $taxonomy, $deleted_term) {
 		
 		global $wpdb;
 		
 		$values = $wpdb->query($wpdb->prepare(
 			"DELETE FROM $wpdb->options WHERE option_name LIKE %s",
-			'%' . $taxonomy . '_' . $term . '%'
+			'%'.$taxonomy.'_'.$term.'%'
 		));
 		
 	}

includes/acf/forms/widget.php

Indentation +4 added lines, -4 removed lines

@@ -181,8 +181,8 @@ 
 		$id = acf_maybe_get($_POST, 'widget-id');
 		
 	    
-	    // save data
-	    if( $id && acf_validate_save_post() ) {
+		// save data
+		if( $id && acf_validate_save_post() ) {
 	    	
 			acf_save_post( "widget_{$id}" );		
 		
@@ -218,8 +218,8 @@ 
 		}
 		
 		
-	    // save
-	    if( acf_validate_save_post() ) {
+		// save
+		if( acf_validate_save_post() ) {
 	    	
 			acf_save_post( "widget_{$widget->id}" );		
 		

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_widget') ) :
+if ( ! class_exists('acf_form_widget')) :
 
 class acf_form_widget {
 	
@@ -31,16 +31,16 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',		array($this, 'admin_enqueue_scripts'));
-		add_action('in_widget_form', 			array($this, 'edit_widget'), 10, 3);
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
+		add_action('in_widget_form', array($this, 'edit_widget'), 10, 3);
 		
 		
 		// filters
-		add_filter('widget_update_callback', 	array($this, 'widget_update_callback'), 10, 4);
+		add_filter('widget_update_callback', array($this, 'widget_update_callback'), 10, 4);
 		
 		
 		// ajax
-		add_action('wp_ajax_update-widget', 	array($this, 'ajax_update_widget'), 0, 1);
+		add_action('wp_ajax_update-widget', array($this, 'ajax_update_widget'), 0, 1);
 		
 	}
 	
@@ -62,7 +62,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate screen
-		if( acf_is_screen('widgets') || acf_is_screen('customize') ) {
+		if (acf_is_screen('widgets') || acf_is_screen('customize')) {
 		
 			// valid
 			
@@ -97,14 +97,14 @@ 
 	*  @param	$instance (object)
 	*  @return	$post_id (int)
 	*/
-	function edit_widget( $widget, $return, $instance ) {
+	function edit_widget($widget, $return, $instance) {
 		
 		// vars
 		$post_id = 0;
 		
 		
 		// get id
-		if( $widget->number !== '__i__' ) {
+		if ($widget->number !== '__i__') {
 		
 			$post_id = "widget_{$widget->id}";
 			
@@ -118,7 +118,7 @@ 
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// render post data
 			acf_form_data(array( 
@@ -127,15 +127,15 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
-				acf_render_fields( $post_id, $fields, 'div', 'field' );
+				acf_render_fields($post_id, $fields, 'div', 'field');
 				
 			}
 			
-			if( $widget->updated ): ?>
+			if ($widget->updated): ?>
 			<script type="text/javascript">
 			(function($) {
 				
@@ -170,7 +170,7 @@ 
 		
 		
 		// bail early if no nonce
-		if( !acf_verify_nonce('widget') ) {
+		if ( ! acf_verify_nonce('widget')) {
 		
 			return;
 			
@@ -182,9 +182,9 @@ 
 		
 	    
 	    // save data
-	    if( $id && acf_validate_save_post() ) {
+	    if ($id && acf_validate_save_post()) {
 	    	
-			acf_save_post( "widget_{$id}" );		
+			acf_save_post("widget_{$id}");		
 		
 		}
 		
@@ -208,10 +208,10 @@ 
 	*  @return	$instance
 	*/
 	
-	function widget_update_callback( $instance, $new_instance, $old_instance, $widget ) {
+	function widget_update_callback($instance, $new_instance, $old_instance, $widget) {
 		
 		// bail early if no nonce
-		if( !acf_verify_nonce('widget') ) {
+		if ( ! acf_verify_nonce('widget')) {
 		
 			return $instance;
 			
@@ -219,9 +219,9 @@ 
 		
 		
 	    // save
-	    if( acf_validate_save_post() ) {
+	    if (acf_validate_save_post()) {
 	    	
-			acf_save_post( "widget_{$widget->id}" );		
+			acf_save_post("widget_{$widget->id}");		
 		
 		}
 		
@@ -349,7 +349,7 @@ 
 		
 	});
 	
-	<?php if( acf_is_screen('customize') ): ?>
+	<?php if (acf_is_screen('customize')): ?>
 	
 	// customizer saves widget on any input change, so unload is not needed
 	acf.unload.active = 0;

includes/acf/pro/acf-pro.php

Spacing +46 added lines, -46 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
 
-if( !class_exists('acf_pro') ):
+if ( ! class_exists('acf_pro')):
 
 class acf_pro {
 	
@@ -20,8 +20,8 @@ 
 	function __construct() {
 		
 		// update setting
-		acf_update_setting( 'pro', true );
-		acf_update_setting( 'name', __('Advanced Custom Fields PRO', 'acf') );
+		acf_update_setting('pro', true);
+		acf_update_setting('name', __('Advanced Custom Fields PRO', 'acf'));
 		
 
 		// api
@@ -34,7 +34,7 @@ 
 			
 			
 		// admin
-		if( is_admin() ) {
+		if (is_admin()) {
 			
 			// options page
 			acf_include('pro/admin/options-page.php');
@@ -46,17 +46,17 @@ 
 		
 		
 		// actions
-		add_action('init',										array($this, 'register_assets'));
-		add_action('acf/include_field_types',					array($this, 'include_field_types'), 5);
-		add_action('acf/input/admin_enqueue_scripts',			array($this, 'input_admin_enqueue_scripts'));
-		add_action('acf/field_group/admin_enqueue_scripts',		array($this, 'field_group_admin_enqueue_scripts'));
-		add_action('acf/field_group/admin_l10n',				array($this, 'field_group_admin_l10n'));
+		add_action('init', array($this, 'register_assets'));
+		add_action('acf/include_field_types', array($this, 'include_field_types'), 5);
+		add_action('acf/input/admin_enqueue_scripts', array($this, 'input_admin_enqueue_scripts'));
+		add_action('acf/field_group/admin_enqueue_scripts', array($this, 'field_group_admin_enqueue_scripts'));
+		add_action('acf/field_group/admin_l10n', array($this, 'field_group_admin_l10n'));
 		
 		
 		// filters
-		add_filter('acf/get_valid_field',						array($this, 'get_valid_field'), 11, 1);
-		add_filter('acf/prepare_field_for_export', 				array($this, 'prepare_field_for_export'));
-		add_filter('acf/prepare_field_for_import', 				array($this, 'prepare_field_for_import'));
+		add_filter('acf/get_valid_field', array($this, 'get_valid_field'), 11, 1);
+		add_filter('acf/prepare_field_for_export', array($this, 'prepare_field_for_export'));
+		add_filter('acf/prepare_field_for_import', array($this, 'prepare_field_for_import'));
 		
 	}
 	
@@ -96,14 +96,14 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_field( $field ) {
+	function get_valid_field($field) {
 		
 		// extract old width
-		$width = acf_extract_var( $field, 'column_width' );
+		$width = acf_extract_var($field, 'column_width');
 		
 		
 		// if old width, update the new width
-		if( $width ) {
+		if ($width) {
 			
 			$field['wrapper']['width'] = $width;
 		}
@@ -131,17 +131,17 @@ 
 	function register_assets() {
 		
 		// min
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 		
 		
 		// register scripts
-		wp_register_script( 'acf-pro-input', acf_get_dir( "pro/assets/js/acf-pro-input{$min}.js" ), false, acf_get_setting('version') );
-		wp_register_script( 'acf-pro-field-group', acf_get_dir( "pro/assets/js/acf-pro-field-group{$min}.js" ), false, acf_get_setting('version') );
+		wp_register_script('acf-pro-input', acf_get_dir("pro/assets/js/acf-pro-input{$min}.js"), false, acf_get_setting('version'));
+		wp_register_script('acf-pro-field-group', acf_get_dir("pro/assets/js/acf-pro-field-group{$min}.js"), false, acf_get_setting('version'));
 		
 		
 		// register styles
-		wp_register_style( 'acf-pro-input', acf_get_dir( 'pro/assets/css/acf-pro-input.css' ), false, acf_get_setting('version') ); 
-		wp_register_style( 'acf-pro-field-group', acf_get_dir( 'pro/assets/css/acf-pro-field-group.css' ), false, acf_get_setting('version') ); 
+		wp_register_style('acf-pro-input', acf_get_dir('pro/assets/css/acf-pro-input.css'), false, acf_get_setting('version')); 
+		wp_register_style('acf-pro-field-group', acf_get_dir('pro/assets/css/acf-pro-field-group.css'), false, acf_get_setting('version')); 
 		
 	}
 	
@@ -184,11 +184,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function field_group_admin_l10n( $l10n ) {
+	function field_group_admin_l10n($l10n) {
 		
 		// append
 		$l10n['flexible_content'] = array(
-			'layout_warning' => __('Flexible Content requires at least 1 layout','acf')
+			'layout_warning' => __('Flexible Content requires at least 1 layout', 'acf')
 		);
 		
 		
@@ -236,23 +236,23 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function prepare_field_for_export( $field ) {
+	function prepare_field_for_export($field) {
 		
 		// sub field (parent_layout)
-		acf_extract_var( $field, 'parent_layout');
+		acf_extract_var($field, 'parent_layout');
 		
 		
 		// repeater
-		if( $field['type'] == 'repeater' ) {
+		if ($field['type'] == 'repeater') {
 			
-			$field['sub_fields'] = acf_prepare_fields_for_export( $field['sub_fields'] );
+			$field['sub_fields'] = acf_prepare_fields_for_export($field['sub_fields']);
 		
 		// flexible content
-		} elseif( $field['type'] == 'flexible_content' ) {
+		} elseif ($field['type'] == 'flexible_content') {
 			
-			foreach( $field['layouts'] as $l => $layout ) {
+			foreach ($field['layouts'] as $l => $layout) {
 				
-				$field['layouts'][ $l ]['sub_fields'] = acf_prepare_fields_for_export( $layout['sub_fields'] );
+				$field['layouts'][$l]['sub_fields'] = acf_prepare_fields_for_export($layout['sub_fields']);
 			
 			}
 
@@ -278,29 +278,29 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function prepare_field_for_import( $field ) {
+	function prepare_field_for_import($field) {
 		
 		// var
 		$extra = array();
 		
 		
 		// sub fields
-		if( $field['type'] == 'repeater' ) {
+		if ($field['type'] == 'repeater') {
 			
 			// extract sub fields
-			$sub_fields = acf_extract_var( $field, 'sub_fields');
+			$sub_fields = acf_extract_var($field, 'sub_fields');
 			
 			
 			// reset field setting
 			$field['sub_fields'] = array();
 			
 			
-			if( !empty($sub_fields) ) {
+			if ( ! empty($sub_fields)) {
 			
-				foreach( array_keys($sub_fields) as $i ) {
+				foreach (array_keys($sub_fields) as $i) {
 					
 					// extract sub field
-					$sub_field = acf_extract_var( $sub_fields, $i );
+					$sub_field = acf_extract_var($sub_fields, $i);
 							
 					
 					// attributes
@@ -314,10 +314,10 @@ 
 				
 			}
 			
-		} elseif( $field['type'] == 'flexible_content' ) {
+		} elseif ($field['type'] == 'flexible_content') {
 			
 			// extract layouts
-			$layouts = acf_extract_var( $field, 'layouts');
+			$layouts = acf_extract_var($field, 'layouts');
 			
 			
 			// reset field setting
@@ -325,17 +325,17 @@ 
 			
 			
 			// validate layouts
-			if( !empty($layouts) ) {
+			if ( ! empty($layouts)) {
 				
 				// loop over layouts
-				foreach( array_keys($layouts) as $i ) {
+				foreach (array_keys($layouts) as $i) {
 					
 					// extract layout
-					$layout = acf_extract_var( $layouts, $i );
+					$layout = acf_extract_var($layouts, $i);
 					
 					
 					// get valid layout (fixes ACF4 export code bug undefined index 'key')
-					if( empty($layout['key']) ) {
+					if (empty($layout['key'])) {
 						
 						$layout['key'] = uniqid();
 						
@@ -343,17 +343,17 @@ 
 					
 					
 					// extract sub fields
-					$sub_fields = acf_extract_var( $layout, 'sub_fields');
+					$sub_fields = acf_extract_var($layout, 'sub_fields');
 					
 					
 					// validate sub fields
-					if( !empty($sub_fields) ) {
+					if ( ! empty($sub_fields)) {
 						
 						// loop over sub fields
-						foreach( array_keys($sub_fields) as $j ) {
+						foreach (array_keys($sub_fields) as $j) {
 							
 							// extract sub field
-							$sub_field = acf_extract_var( $sub_fields, $j );
+							$sub_field = acf_extract_var($sub_fields, $j);
 							
 							
 							// attributes
@@ -380,7 +380,7 @@ 
 		
 		
 		// extra
-		if( !empty($extra) ) {
+		if ( ! empty($extra)) {
 			
 			array_unshift($extra, $field);
 			

includes/acf/pro/admin/options-page.php

Indentation +16 added lines, -16 removed lines

@@ -45,9 +45,9 @@ 
 	
 	function rule_types( $choices ) {
 		
-	    $choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
+		$choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
 		
-	    return $choices;
+		return $choices;
 	}
 	
 	
@@ -86,7 +86,7 @@ 
 		
 		
 		// return
-	    return $choices;
+		return $choices;
 	}
 	
 	
@@ -129,19 +129,19 @@ 
 		// match
 		if( $rule['operator'] == "==" ) {
 		
-        	$match = ( $options_page === $rule['value'] );
+			$match = ( $options_page === $rule['value'] );
         	
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         
-        	$match = ( $options_page !== $rule['value'] );
+			$match = ( $options_page !== $rule['value'] );
         	
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
 	
 	/*
@@ -216,17 +216,17 @@ 
 		if( acf_verify_nonce('options') ) {
 		
 			// save data
-		    if( acf_validate_save_post(true) ) {
+			if( acf_validate_save_post(true) ) {
 		    	
-		    	// get post_id (allow lang modification)
-		    	$post_id = acf_get_valid_post_id($this->page['post_id']);
+				// get post_id (allow lang modification)
+				$post_id = acf_get_valid_post_id($this->page['post_id']);
 		    	
 		    	
-		    	// set autoload
-		    	acf_update_setting('autoload', $this->page['autoload']);
+				// set autoload
+				acf_update_setting('autoload', $this->page['autoload']);
 		    	
 		    	
-		    	// save
+				// save
 				acf_save_post( $post_id );
 				
 				

Spacing +44 added lines, -44 removed lines

@@ -21,13 +21,13 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_menu', array($this,'admin_menu'), 99, 0);
+		add_action('admin_menu', array($this, 'admin_menu'), 99, 0);
 		
 		
 		// filters
-		add_filter( 'acf/location/rule_types', 					array($this, 'rule_types'), 10, 1 );
-		add_filter( 'acf/location/rule_values/options_page',	array($this, 'rule_values'), 10, 1 );
-		add_filter( 'acf/location/rule_match/options_page',		array($this, 'rule_match'), 10, 3 );
+		add_filter('acf/location/rule_types', array($this, 'rule_types'), 10, 1);
+		add_filter('acf/location/rule_values/options_page', array($this, 'rule_values'), 10, 1);
+		add_filter('acf/location/rule_match/options_page', array($this, 'rule_match'), 10, 3);
 	}
 		
 	
@@ -43,9 +43,9 @@ 
 	*  @return	{array}	$choices
 	*/
 	
-	function rule_types( $choices ) {
+	function rule_types($choices) {
 		
-	    $choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
+	    $choices[__("Forms", 'acf')]['options_page'] = __("Options Page", 'acf');
 		
 	    return $choices;
 	}
@@ -63,18 +63,18 @@ 
 	*  @return	{array}	$choices
 	*/
 	
-	function rule_values( $choices ) {
+	function rule_values($choices) {
 		
 		// vars
 		$pages = acf_get_options_pages();
 		
 		
 		// populate
-		if( !empty($pages) ) {
+		if ( ! empty($pages)) {
 		
-			foreach( $pages as $page ) {
+			foreach ($pages as $page) {
 			
-				$choices[ $page['menu_slug'] ] = $page['menu_title'];
+				$choices[$page['menu_slug']] = $page['menu_title'];
 				
 			}
 			
@@ -103,21 +103,21 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function rule_match( $match, $rule, $options ) {
+	function rule_match($match, $rule, $options) {
 		
 		// vars
 		$options_page = false;
 		
 		
 		// $options does not contain a default for "options_page"
-		if( isset($options['options_page']) ) {
+		if (isset($options['options_page'])) {
 		
 			$options_page = $options['options_page'];
 			
 		}
 		
 
-		if( !$options_page ) {
+		if ( ! $options_page) {
 		
 			global $plugin_page;
 			
@@ -127,13 +127,13 @@ 
 		
 		
 		// match
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 		
-        	$match = ( $options_page === $rule['value'] );
+        	$match = ($options_page === $rule['value']);
         	
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         
-        	$match = ( $options_page !== $rule['value'] );
+        	$match = ($options_page !== $rule['value']);
         	
         }
         
@@ -164,29 +164,29 @@ 
 		
 		
 		// create pages
-		if( !empty($pages) ) {
+		if ( ! empty($pages)) {
 		
-			foreach( $pages as $page ) {
+			foreach ($pages as $page) {
 				
 				// vars
 				$slug = '';
 				
 				
-				if( empty($page['parent_slug']) ) {
+				if (empty($page['parent_slug'])) {
 					
 					// add page
-					$slug = add_menu_page( $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'), $page['icon_url'], $page['position'] );
+					$slug = add_menu_page($page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'), $page['icon_url'], $page['position']);
 					
 				} else {
 					
 					// add page
-					$slug = add_submenu_page( $page['parent_slug'], $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html') );
+					$slug = add_submenu_page($page['parent_slug'], $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'));
 					
 				}
 				
 				
 				// actions
-				add_action("load-{$slug}", array($this,'admin_load'));
+				add_action("load-{$slug}", array($this, 'admin_load'));
 			}
 			
 		}
@@ -213,10 +213,10 @@ 
 		    	
 		    	
 		// verify and remove nonce
-		if( acf_verify_nonce('options') ) {
+		if (acf_verify_nonce('options')) {
 		
 			// save data
-		    if( acf_validate_save_post(true) ) {
+		    if (acf_validate_save_post(true)) {
 		    	
 		    	// get post_id (allow lang modification)
 		    	$post_id = acf_get_valid_post_id($this->page['post_id']);
@@ -227,11 +227,11 @@ 
 		    	
 		    	
 		    	// save
-				acf_save_post( $post_id );
+				acf_save_post($post_id);
 				
 				
 				// redirect
-				wp_redirect( admin_url("admin.php?page={$plugin_page}&message=1") );
+				wp_redirect(admin_url("admin.php?page={$plugin_page}&message=1"));
 				exit;
 				
 			}
@@ -244,7 +244,7 @@ 
 		
 		
 		// actions
-		add_action( 'acf/input/admin_head',		array($this,'admin_head') );
+		add_action('acf/input/admin_head', array($this, 'admin_head'));
 	
 	}
 	
@@ -271,34 +271,34 @@ 
 		
 		
 		// notices
-		if( !empty($_GET['message']) && $_GET['message'] == '1' ) {
+		if ( ! empty($_GET['message']) && $_GET['message'] == '1') {
 		
-			acf_add_admin_notice( __("Options Updated",'acf') );
+			acf_add_admin_notice(__("Options Updated", 'acf'));
 			
 		}
 		
-		if( empty($field_groups) ) {
+		if (empty($field_groups)) {
 		
-			acf_add_admin_notice(__("No Custom Field Groups found for this options page",'acf') . '. <a href="' . admin_url() . 'post-new.php?post_type=acf-field-group">' . __("Create a Custom Field Group",'acf') . '</a>', 'error');
+			acf_add_admin_notice(__("No Custom Field Groups found for this options page", 'acf').'. <a href="'.admin_url().'post-new.php?post_type=acf-field-group">'.__("Create a Custom Field Group", 'acf').'</a>', 'error');
 		
 		} else {
 			
-			foreach( $field_groups as $i => $field_group ) {
+			foreach ($field_groups as $i => $field_group) {
 			
 				// vars
 				$id = "acf-{$field_group['key']}";
 				$title = $field_group['title'];
 				$context = $field_group['position'];
 				$priority = 'high';
-				$args = array( 'field_group' => $field_group );
+				$args = array('field_group' => $field_group);
 				
 				
 				// tweaks to vars
-				if( $context == 'acf_after_title' ) {
+				if ($context == 'acf_after_title') {
 					
 					$context = 'normal';
 					
-				} elseif( $context == 'side' ) {
+				} elseif ($context == 'side') {
 				
 					$priority = 'core';
 					
@@ -310,7 +310,7 @@ 
 				
 				
 				// add meta box
-				add_meta_box( $id, $title, array($this, 'render_meta_box'), 'acf_options_page', $context, $priority, $args );
+				add_meta_box($id, $title, array($this, 'render_meta_box'), 'acf_options_page', $context, $priority, $args);
 				
 				
 			}
@@ -335,11 +335,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function render_meta_box( $post, $args ) {
+	function render_meta_box($post, $args) {
 		
 		// extract args
-		extract( $args ); // all variables from the add_meta_box function
-		extract( $args ); // all variables from the args argument
+		extract($args); // all variables from the add_meta_box function
+		extract($args); // all variables from the args argument
 		
 		
 		// vars
@@ -360,19 +360,19 @@ 
 		
 		
 		// edit_url
-		if( $field_group['ID'] && acf_current_user_can_admin() ) {
+		if ($field_group['ID'] && acf_current_user_can_admin()) {
 			
-			$o['edit_url'] = admin_url('post.php?post=' . $field_group['ID'] . '&action=edit');
+			$o['edit_url'] = admin_url('post.php?post='.$field_group['ID'].'&action=edit');
 				
 		}
 		
 		
 		// load fields
-		$fields = acf_get_fields( $field_group );
+		$fields = acf_get_fields($field_group);
 		
 		
 		// render
-		acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] );
+		acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']);