rousnay / lighthouse

includes/acf/admin/field-group.php

Indentation +17 added lines, -17 removed lines

@@ -282,13 +282,13 @@ 
 		
 		
 		// append
-	    $html .= '<div id="acf-append-show-on-screen" class="acf-hidden">';
-	    $html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" ' . $checked . ' /> ' . __('Field Keys','acf') . '</label>';
+		$html .= '<div id="acf-append-show-on-screen" class="acf-hidden">';
+		$html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" ' . $checked . ' /> ' . __('Field Keys','acf') . '</label>';
 		$html .= '</div>';
 	    
 	    
-	    // return
-	    return $html;
+		// return
+		return $html;
 	    
 	}
 	
@@ -396,9 +396,9 @@ 
 		// only save once! WordPress save's a revision as well.
 		if( wp_is_post_revision($post_id) ) {
 		
-	    	return $post_id;
+			return $post_id;
 	    	
-        }
+		}
         
         
 		// verify nonce
@@ -409,11 +409,11 @@ 
 		}
         
         
-        // disable local to avoid conflicts between DB and local
+		// disable local to avoid conflicts between DB and local
 		acf_disable_local();
 		
         
-        // save fields
+		// save fields
 		unset( $_POST['acf_fields']['acfcloneindex'] );
 		
 		if( !empty($_POST['acf_fields']) ) {
@@ -453,10 +453,10 @@ 
 		
 		
 		// delete fields
-        if( $_POST['_acf_delete_fields'] ) {
+		if( $_POST['_acf_delete_fields'] ) {
         	
-	    	$ids = explode('|', $_POST['_acf_delete_fields']);
-	    	$ids = array_map( 'intval', $ids );
+			$ids = explode('|', $_POST['_acf_delete_fields']);
+			$ids = array_map( 'intval', $ids );
 	    	
 			foreach( $ids as $id ) {
 			
@@ -468,20 +468,20 @@ 
 				
 			}
 			
-        }
+		}
 		
 		
 		// add args
-        $_POST['acf_field_group']['ID'] = $post_id;
-        $_POST['acf_field_group']['title'] = $_POST['post_title'];
+		$_POST['acf_field_group']['ID'] = $post_id;
+		$_POST['acf_field_group']['title'] = $_POST['post_title'];
         
         
 		// save field group
-        acf_update_field_group( $_POST['acf_field_group'] );
+		acf_update_field_group( $_POST['acf_field_group'] );
 		
 		
-        // return
-        return $post_id;
+		// return
+		return $post_id;
 	}
 	
 	

Spacing +121 added lines, -121 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Admin
 */
 
-if( ! class_exists('acf_admin_field_group') ) :
+if ( ! class_exists('acf_admin_field_group')) :
 
 class acf_admin_field_group {
 	
@@ -31,18 +31,18 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('current_screen',									array($this, 'current_screen'));
-		add_action('save_post',											array($this, 'save_post'), 10, 2);
+		add_action('current_screen', array($this, 'current_screen'));
+		add_action('save_post', array($this, 'save_post'), 10, 2);
 		
 		
 		// ajax
-		add_action('wp_ajax_acf/field_group/render_field_settings',		array($this, 'ajax_render_field_settings'));
-		add_action('wp_ajax_acf/field_group/render_location_value',		array($this, 'ajax_render_location_value'));
-		add_action('wp_ajax_acf/field_group/move_field',				array($this, 'ajax_move_field'));
+		add_action('wp_ajax_acf/field_group/render_field_settings', array($this, 'ajax_render_field_settings'));
+		add_action('wp_ajax_acf/field_group/render_location_value', array($this, 'ajax_render_location_value'));
+		add_action('wp_ajax_acf/field_group/move_field', array($this, 'ajax_move_field'));
 		
 		
 		// filters
-		add_filter('post_updated_messages',								array($this, 'post_updated_messages'));
+		add_filter('post_updated_messages', array($this, 'post_updated_messages'));
 		
 	}
 	
@@ -60,7 +60,7 @@ 
 	*  @return	$messages
 	*/
 	
-	function post_updated_messages( $messages ) {
+	function post_updated_messages($messages) {
 		
 		// append to messages
 		$messages['acf-field-group'] = array(
@@ -99,7 +99,7 @@ 
 	function current_screen() {
 		
 		// validate screen
-		if( !acf_is_screen('acf-field-group') ) {
+		if ( ! acf_is_screen('acf-field-group')) {
 		
 			return;
 			
@@ -111,9 +111,9 @@ 
 		
 		
 		// actions
-		add_action('admin_enqueue_scripts',		array($this,'admin_enqueue_scripts'), 20);
-		add_action('admin_head', 				array($this,'admin_head'), 20);
-		add_action('admin_footer', 				array($this,'admin_footer'), 20);
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 20);
+		add_action('admin_head', array($this, 'admin_head'), 20);
+		add_action('admin_footer', array($this, 'admin_footer'), 20);
 		
 	}
 	
@@ -169,22 +169,22 @@ 
 		
 		
 		// set global var
-		$field_group = acf_get_field_group( $post );
+		$field_group = acf_get_field_group($post);
 		
 		
 		// metaboxes
-		add_meta_box('acf-field-group-fields', __("Fields",'acf'), array($this, 'mb_fields'), 'acf-field-group', 'normal', 'high');
-		add_meta_box('acf-field-group-locations', __("Location",'acf'), array($this, 'mb_locations'), 'acf-field-group', 'normal', 'high');
-		add_meta_box('acf-field-group-options', __("Settings",'acf'), array($this, 'mb_options'), 'acf-field-group', 'normal', 'high');
+		add_meta_box('acf-field-group-fields', __("Fields", 'acf'), array($this, 'mb_fields'), 'acf-field-group', 'normal', 'high');
+		add_meta_box('acf-field-group-locations', __("Location", 'acf'), array($this, 'mb_locations'), 'acf-field-group', 'normal', 'high');
+		add_meta_box('acf-field-group-options', __("Settings", 'acf'), array($this, 'mb_options'), 'acf-field-group', 'normal', 'high');
 		
 		
 		// actions
-		add_action('post_submitbox_misc_actions',	array($this, 'post_submitbox_misc_actions'), 10, 0);
-		add_action('edit_form_after_title',			array($this, 'edit_form_after_title'), 10, 0);
+		add_action('post_submitbox_misc_actions', array($this, 'post_submitbox_misc_actions'), 10, 0);
+		add_action('edit_form_after_title', array($this, 'edit_form_after_title'), 10, 0);
 		
 		
 		// filters
-		add_filter('screen_settings',				array($this, 'screen_settings'), 10, 1);
+		add_filter('screen_settings', array($this, 'screen_settings'), 10, 1);
 		
 		
 		// action for 3rd party customisation
@@ -214,27 +214,27 @@ 
 		
 		// vars
 		$l10n = apply_filters('acf/field_group/admin_l10n', array(
-			'move_to_trash'			=> __("Move to trash. Are you sure?",'acf'),
-			'checked'				=> __("checked",'acf'),
-			'no_fields'				=> __("No toggle fields available",'acf'),
-			'title_is_required'		=> __("Field group title is required",'acf'),
-			'copy'					=> __("copy",'acf'),
-			'or'					=> __("or",'acf'),
-			'fields'				=> __("Fields",'acf'),
-			'parent_fields'			=> __("Parent fields",'acf'),
-			'sibling_fields'		=> __("Sibling fields",'acf'),
-			'move_field'			=> __("Move Custom Field",'acf'),
-			'move_field_warning'	=> __("This field cannot be moved until its changes have been saved",'acf'),
-			'null'					=> __("Null",'acf'),
-			'unload'				=> __('The changes you made will be lost if you navigate away from this page','acf'),
-			'field_name_start'		=> __('The string "field_" may not be used at the start of a field name','acf'),
+			'move_to_trash'			=> __("Move to trash. Are you sure?", 'acf'),
+			'checked'				=> __("checked", 'acf'),
+			'no_fields'				=> __("No toggle fields available", 'acf'),
+			'title_is_required'		=> __("Field group title is required", 'acf'),
+			'copy'					=> __("copy", 'acf'),
+			'or'					=> __("or", 'acf'),
+			'fields'				=> __("Fields", 'acf'),
+			'parent_fields'			=> __("Parent fields", 'acf'),
+			'sibling_fields'		=> __("Sibling fields", 'acf'),
+			'move_field'			=> __("Move Custom Field", 'acf'),
+			'move_field_warning'	=> __("This field cannot be moved until its changes have been saved", 'acf'),
+			'null'					=> __("Null", 'acf'),
+			'unload'				=> __('The changes you made will be lost if you navigate away from this page', 'acf'),
+			'field_name_start'		=> __('The string "field_" may not be used at the start of a field name', 'acf'),
 		));
 		
 		$o = array(
 			'post_id'				=> $post->ID,
-			'nonce'					=> wp_create_nonce( 'acf_nonce' ),
+			'nonce'					=> wp_create_nonce('acf_nonce'),
 			'admin_url'				=> admin_url(),
-			'ajaxurl'				=> admin_url( 'admin-ajax.php' ),
+			'ajaxurl'				=> admin_url('admin-ajax.php'),
 			'validation'			=> 0,
 		);
 		
@@ -275,7 +275,7 @@ 
 	*  @return	$current
 	*/
 	
-	function screen_settings( $html ) {
+	function screen_settings($html) {
 		
 		// vars
 		$checked = acf_get_user_setting('show_field_keys') ? 'checked="checked"' : '';
@@ -283,7 +283,7 @@ 
 		
 		// append
 	    $html .= '<div id="acf-append-show-on-screen" class="acf-hidden">';
-	    $html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" ' . $checked . ' /> ' . __('Field Keys','acf') . '</label>';
+	    $html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" '.$checked.' /> '.__('Field Keys', 'acf').'</label>';
 		$html .= '</div>';
 	    
 	    
@@ -313,7 +313,7 @@ 
 		
 		
 		// vars
-		$status = $field_group['active'] ? __("Active",'acf') : __("Disabled",'acf');
+		$status = $field_group['active'] ? __("Active", 'acf') : __("Disabled", 'acf');
 		
 ?>
 <script type="text/javascript">
@@ -353,7 +353,7 @@ 
 		
 		?>
 		<div id="acf-form-data" class="acf-hidden">
-			<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( 'field_group' ); ?>" />
+			<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce('field_group'); ?>" />
 			<input type="hidden" name="_acf_delete_fields" value="0" id="input-delete-fields" />
 			<?php do_action('acf/field_group/form_data'); ?>
 		</div>
@@ -375,10 +375,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;
 			
@@ -386,7 +386,7 @@ 
 		
 		
 		// bail early if not acf-field-group
-		if( $post->post_type !== 'acf-field-group' ) {
+		if ($post->post_type !== 'acf-field-group') {
 			
 			return $post_id;
 			
@@ -394,7 +394,7 @@ 
 		
 		
 		// only save once! WordPress save's a revision as well.
-		if( wp_is_post_revision($post_id) ) {
+		if (wp_is_post_revision($post_id)) {
 		
 	    	return $post_id;
 	    	
@@ -402,7 +402,7 @@ 
         
         
 		// verify nonce
-		if( !acf_verify_nonce('field_group') ) {
+		if ( ! acf_verify_nonce('field_group')) {
 		
 			return $post_id;
 			
@@ -414,19 +414,19 @@ 
 		
         
         // save fields
-		unset( $_POST['acf_fields']['acfcloneindex'] );
+		unset($_POST['acf_fields']['acfcloneindex']);
 		
-		if( !empty($_POST['acf_fields']) ) {
+		if ( ! empty($_POST['acf_fields'])) {
 			
-			foreach( $_POST['acf_fields'] as $field ) {
+			foreach ($_POST['acf_fields'] as $field) {
 				
 				// vars
 				$specific = false;
-				$save = acf_extract_var( $field, 'save' );
+				$save = acf_extract_var($field, 'save');
 				
 				
 				// only saved field if has changed
-				if( $save == 'meta' ) {
+				if ($save == 'meta') {
 				
 					$specific = array(
 						'menu_order',
@@ -437,7 +437,7 @@ 
 				
 				
 				// set field parent
-				if( empty($field['parent']) ) {
+				if (empty($field['parent'])) {
 					
 					$field['parent'] = $post_id;
 					
@@ -445,7 +445,7 @@ 
 				
 				
 				// save field
-				acf_update_field( $field, $specific );
+				acf_update_field($field, $specific);
 				
 			}
 			
@@ -453,16 +453,16 @@ 
 		
 		
 		// delete fields
-        if( $_POST['_acf_delete_fields'] ) {
+        if ($_POST['_acf_delete_fields']) {
         	
 	    	$ids = explode('|', $_POST['_acf_delete_fields']);
-	    	$ids = array_map( 'intval', $ids );
+	    	$ids = array_map('intval', $ids);
 	    	
-			foreach( $ids as $id ) {
+			foreach ($ids as $id) {
 			
-				if( $id != 0 ) {
+				if ($id != 0) {
 				
-					acf_delete_field( $id );
+					acf_delete_field($id);
 					
 				}
 				
@@ -477,7 +477,7 @@ 
         
         
 		// save field group
-        acf_update_field_group( $_POST['acf_field_group'] );
+        acf_update_field_group($_POST['acf_field_group']);
 		
 		
         // return
@@ -506,7 +506,7 @@ 
 		
 		// get fields
 		$view = array(
-			'fields' => acf_get_fields_by_id( $field_group['ID'] )
+			'fields' => acf_get_fields_by_id($field_group['ID'])
 		);
 		
 		
@@ -536,7 +536,7 @@ 
 		
 		
 		// field key (leave in for compatibility)
-		if( !acf_is_field_group_key( $field_group['key']) ) {
+		if ( ! acf_is_field_group_key($field_group['key'])) {
 			
 			$field_group['key'] = uniqid('group_');
 			
@@ -544,7 +544,7 @@ 
 		
 		
 		// don't use view because we need access to $this context
-		include( acf_get_path('admin/views/field-group-options.php') );
+		include(acf_get_path('admin/views/field-group-options.php'));
 		
 	}
 	
@@ -569,7 +569,7 @@ 
 		
 		
 		// UI needs at lease 1 location rule
-		if( empty($field_group['location']) ) {
+		if (empty($field_group['location'])) {
 			
 			$field_group['location'] = array(
 				
@@ -589,7 +589,7 @@ 
 		
 		
 		// don't use view because we need access to $this context
-		include( acf_get_path('admin/views/field-group-locations.php') );
+		include(acf_get_path('admin/views/field-group-locations.php'));
 		
 	}
 	
@@ -607,10 +607,10 @@ 
 	*  @return	N/A
 	*/
 	
-	function render_location_value( $options ) {
+	function render_location_value($options) {
 		
 		// vars
-		$options = wp_parse_args( $options, array(
+		$options = wp_parse_args($options, array(
 			'group_id'	=> 0,
 			'rule_id'	=> 0,
 			'value'		=> null,
@@ -623,14 +623,14 @@ 
 		
 		
 		// some case's have the same outcome
-		if( $options['param'] == "page_parent" ) {
+		if ($options['param'] == "page_parent") {
 		
 			$options['param'] = "page";
 			
 		}
 
 		
-		switch( $options['param'] ) {
+		switch ($options['param']) {
 			
 			
 			/*
@@ -641,8 +641,8 @@ 
 				
 				// all post types except attachment
 				$exclude = array('attachment');
-				$choices = acf_get_post_types( $exclude );
-				$choices = acf_get_pretty_post_types( $choices );
+				$choices = acf_get_post_types($exclude);
+				$choices = acf_get_pretty_post_types($choices);
 
 				break;
 				
@@ -651,7 +651,7 @@ 
 				
 				// get post types
 				$exclude = array('page', 'attachment');
-				$post_types = acf_get_post_types( $exclude );
+				$post_types = acf_get_post_types($exclude);
 				
 						
 				// get posts grouped by post type
@@ -660,25 +660,25 @@ 
 				));
 				
 				
-				if( !empty($groups) ) {
+				if ( ! empty($groups)) {
 			
-					foreach( array_keys($groups) as $group_title ) {
+					foreach (array_keys($groups) as $group_title) {
 						
 						// vars
-						$posts = acf_extract_var( $groups, $group_title );
+						$posts = acf_extract_var($groups, $group_title);
 						
 						
 						// override post data
-						foreach( array_keys($posts) as $post_id ) {
+						foreach (array_keys($posts) as $post_id) {
 							
 							// update
-							$posts[ $post_id ] = acf_get_post_title( $posts[ $post_id ] );
+							$posts[$post_id] = acf_get_post_title($posts[$post_id]);
 							
 						};
 						
 						
 						// append to $choices
-						$choices[ $group_title ] = $posts;
+						$choices[$group_title] = $posts;
 						
 					}
 					
@@ -689,9 +689,9 @@ 
 			
 			case "post_category" :
 				
-				$terms = acf_get_taxonomy_terms( 'category' );
+				$terms = acf_get_taxonomy_terms('category');
 				
-				if( !empty($terms) ) {
+				if ( ! empty($terms)) {
 					
 					$choices = array_pop($terms);
 					
@@ -711,11 +711,11 @@ 
 				
 				global $wp_post_statuses;
 				
-				if( !empty($wp_post_statuses) ) {
+				if ( ! empty($wp_post_statuses)) {
 					
-					foreach( $wp_post_statuses as $status ) {
+					foreach ($wp_post_statuses as $status) {
 						
-						$choices[ $status->name ] = $status->label;
+						$choices[$status->name] = $status->label;
 						
 					}
 					
@@ -729,9 +729,9 @@ 
 				$choices = acf_get_taxonomy_terms();
 				
 				// unset post_format
-				if( isset($choices['post_format']) ) {
+				if (isset($choices['post_format'])) {
 				
-					unset( $choices['post_format']) ;
+					unset($choices['post_format']);
 					
 				}
 							
@@ -751,19 +751,19 @@ 
 				));
 				
 				
-				if( !empty($groups) ) {
+				if ( ! empty($groups)) {
 			
-					foreach( array_keys($groups) as $group_title ) {
+					foreach (array_keys($groups) as $group_title) {
 						
 						// vars
-						$posts = acf_extract_var( $groups, $group_title );
+						$posts = acf_extract_var($groups, $group_title);
 						
 						
 						// override post data
-						foreach( array_keys($posts) as $post_id ) {
+						foreach (array_keys($posts) as $post_id) {
 							
 							// update
-							$posts[ $post_id ] = acf_get_post_title( $posts[ $post_id ] );
+							$posts[$post_id] = acf_get_post_title($posts[$post_id]);
 							
 						};
 						
@@ -782,11 +782,11 @@ 
 			case "page_type" :
 				
 				$choices = array(
-					'front_page'	=>	__("Front Page",'acf'),
-					'posts_page'	=>	__("Posts Page",'acf'),
-					'top_level'		=>	__("Top Level Page (no parent)",'acf'),
-					'parent'		=>	__("Parent Page (has children)",'acf'),
-					'child'			=>	__("Child Page (has parent)",'acf'),
+					'front_page'	=>	__("Front Page", 'acf'),
+					'posts_page'	=>	__("Posts Page", 'acf'),
+					'top_level'		=>	__("Top Level Page (no parent)", 'acf'),
+					'parent'		=>	__("Parent Page (has children)", 'acf'),
+					'child'			=>	__("Child Page (has parent)", 'acf'),
 				);
 								
 				break;
@@ -802,14 +802,14 @@ 
 			case "page_template" :
 				
 				$choices = array(
-					'default'	=>	__("Default Template",'acf'),
+					'default'	=>	__("Default Template", 'acf'),
 				);
 				
 				$templates = get_page_templates();
 				
-				foreach( $templates as $k => $v ) {
+				foreach ($templates as $k => $v) {
 				
-					$choices[ $v ] = $k;
+					$choices[$v] = $k;
 					
 				}
 				
@@ -842,7 +842,7 @@ 
 				
 				
 				// multi-site
-				if( is_multisite() ) {
+				if (is_multisite()) {
 					
 					$choices = array_merge(array(
 						'super_admin' => __('Super Admin', 'acf')
@@ -856,7 +856,7 @@ 
 				
 				global $wp_roles;
 				
-				$choices = array_merge( array('all' => __('All', 'acf')), $wp_roles->get_names() );
+				$choices = array_merge(array('all' => __('All', 'acf')), $wp_roles->get_names());
 			
 				break;
 				
@@ -885,13 +885,13 @@ 
 				
 			case "taxonomy" :
 				
-				$choices = array_merge( array('all' => __('All', 'acf')), acf_get_taxonomies() );
+				$choices = array_merge(array('all' => __('All', 'acf')), acf_get_taxonomies());
 				
 								
 				// unset post_format
-				if( isset($choices['post_format']) ) {
+				if (isset($choices['post_format'])) {
 				
-					unset( $choices['post_format']);
+					unset($choices['post_format']);
 					
 				}
 							
@@ -914,11 +914,11 @@ 
 				);
 				
 				
-				if( !empty( $wp_widget_factory->widgets ) ) {
+				if ( ! empty($wp_widget_factory->widgets)) {
 					
-					foreach( $wp_widget_factory->widgets as $widget ) {
+					foreach ($wp_widget_factory->widgets as $widget) {
 					
-						$choices[ $widget->id_base ] = $widget->name;
+						$choices[$widget->id_base] = $widget->name;
 						
 					}
 					
@@ -929,7 +929,7 @@ 
 		
 		
 		// allow custom location rules
-		$choices = apply_filters( 'acf/location/rule_values/' . $options['param'], $choices );
+		$choices = apply_filters('acf/location/rule_values/'.$options['param'], $choices);
 							
 		
 		// create field
@@ -960,7 +960,7 @@ 
 	function ajax_render_location_value() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -968,7 +968,7 @@ 
 		
 		
 		// call function
-		$this->render_location_value( $_POST );
+		$this->render_location_value($_POST);
 		
 		
 		// die
@@ -1007,7 +1007,7 @@ 
 		
 		
 		// verify nonce
-		if( !wp_verify_nonce($options['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($options['nonce'], 'acf_nonce')) {
 		
 			die(0);
 			
@@ -1015,7 +1015,7 @@ 
 		
 		
 		// required
-		if( !$options['type'] ) {
+		if ( ! $options['type']) {
 		
 			die(0);
 			
@@ -1068,7 +1068,7 @@ 
 		
 		
 		// verify nonce
-		if( ! wp_verify_nonce($args['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($args['nonce'], 'acf_nonce')) {
 		
 			die();
 			
@@ -1076,7 +1076,7 @@ 
 		
 		
 		// confirm?
-		if( $args['field_id'] && $args['field_group_id'] ) {
+		if ($args['field_id'] && $args['field_group_id']) {
 			
 			// vars 
 			$field = acf_get_field($args['field_id']);
@@ -1095,12 +1095,12 @@ 
 			acf_update_field($field);
 			
 			$v1 = $field['label'];
-			$v2 = '<a href="' . admin_url("post.php?post={$field_group['ID']}&action=edit") . '" target="_blank">' . $field_group['title'] . '</a>';
+			$v2 = '<a href="'.admin_url("post.php?post={$field_group['ID']}&action=edit").'" target="_blank">'.$field_group['title'].'</a>';
 			
-			echo '<p><strong>' . __('Move Complete.', 'acf') . '</strong></p>';
-			echo '<p>' . sprintf( __('The %s field can now be found in the %s field group', 'acf'), $v1, $v2 ). '</p>';
+			echo '<p><strong>'.__('Move Complete.', 'acf').'</strong></p>';
+			echo '<p>'.sprintf(__('The %s field can now be found in the %s field group', 'acf'), $v1, $v2).'</p>';
 			
-			echo '<a href="#" class="acf-button blue acf-close-popup">' . __("Close Window",'acf') . '</a>';
+			echo '<a href="#" class="acf-button blue acf-close-popup">'.__("Close Window", 'acf').'</a>';
 			
 			die();
 			
@@ -1112,13 +1112,13 @@ 
 		$choices = array();
 		
 		
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				if( $field_group['ID'] ) {
+				if ($field_group['ID']) {
 					
-					$choices[ $field_group['ID'] ] = $field_group['title'];
+					$choices[$field_group['ID']] = $field_group['title'];
 					
 				}
 				
@@ -1135,14 +1135,14 @@ 
 		));
 		
 		
-		echo '<p>' . __('Please select the destination for this field', 'acf') . '</p>';
+		echo '<p>'.__('Please select the destination for this field', 'acf').'</p>';
 		
 		echo '<form id="acf-move-field-form">';
 		
 			// render
-			acf_render_field_wrap( $field );
+			acf_render_field_wrap($field);
 			
-			echo '<button type="submit" class="acf-button blue">' . __("Move Field",'acf') . '</button>';
+			echo '<button type="submit" class="acf-button blue">'.__("Move Field", 'acf').'</button>';
 			
 		echo '</form>';
 		

includes/acf/admin/field-groups.php

Indentation +5 added lines, -5 removed lines

@@ -568,8 +568,8 @@ 
 				
 			}
         
-        // status
-	    } elseif( $column == 'acf-fg-status' ) {
+		// status
+		} elseif( $column == 'acf-fg-status' ) {
 			
 			if( isset($this->sync[ $field_group['key'] ]) ) {
 				
@@ -587,12 +587,12 @@ 
 				
 			}
 	    
-        // fields
-	    } elseif( $column == 'acf-fg-count' ) {
+		// fields
+		} elseif( $column == 'acf-fg-count' ) {
 			
 			echo acf_get_field_count( $field_group );
         
-        }
+		}
 		
 	}
 	

Spacing +97 added lines, -97 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Admin
 */
 
-if( ! class_exists('acf_admin_field_groups') ) :
+if ( ! class_exists('acf_admin_field_groups')) :
 
 class acf_admin_field_groups {
 	
@@ -35,10 +35,10 @@ 
 	function __construct() {
 	
 		// actions
-		add_action('current_screen',		array($this, 'current_screen'));
-		add_action('trashed_post',			array($this, 'trashed_post'));
-		add_action('untrashed_post',		array($this, 'untrashed_post'));
-		add_action('deleted_post',			array($this, 'deleted_post'));
+		add_action('current_screen', array($this, 'current_screen'));
+		add_action('trashed_post', array($this, 'trashed_post'));
+		add_action('untrashed_post', array($this, 'untrashed_post'));
+		add_action('deleted_post', array($this, 'deleted_post'));
 		
 	}
 	
@@ -59,7 +59,7 @@ 
 	function current_screen() {
 		
 		// validate screen
-		if( !acf_is_screen('edit-acf-field-group') ) {
+		if ( ! acf_is_screen('edit-acf-field-group')) {
 		
 			return;
 			
@@ -71,11 +71,11 @@ 
 		
 		
 		// modify publish post status
-		$wp_post_statuses['publish']->label_count = _n_noop( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', 'acf' );
+		$wp_post_statuses['publish']->label_count = _n_noop('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', 'acf');
 		
 		
 		// reorder trash to end
-		$wp_post_statuses['trash'] = acf_extract_var( $wp_post_statuses, 'trash' );
+		$wp_post_statuses['trash'] = acf_extract_var($wp_post_statuses, 'trash');
 
 		
 		// check stuff
@@ -84,13 +84,13 @@ 
 		
 		
 		// actions
-		add_action('admin_enqueue_scripts',							array($this, 'admin_enqueue_scripts'));
-		add_action('admin_footer',									array($this, 'admin_footer'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
+		add_action('admin_footer', array($this, 'admin_footer'));
 		
 		
 		// columns
-		add_filter('manage_edit-acf-field-group_columns',			array($this, 'field_group_columns'), 10, 1);
-		add_action('manage_acf-field-group_posts_custom_column',	array($this, 'field_group_columns_html'), 10, 2);
+		add_filter('manage_edit-acf-field-group_columns', array($this, 'field_group_columns'), 10, 1);
+		add_action('manage_acf-field-group_posts_custom_column', array($this, 'field_group_columns_html'), 10, 2);
 		
 	}
 	
@@ -131,19 +131,19 @@ 
 	function check_duplicate() {
 		
 		// message
-		if( $ids = acf_maybe_get($_GET, 'acfduplicatecomplete') ) {
+		if ($ids = acf_maybe_get($_GET, 'acfduplicatecomplete')) {
 			
 			// explode
 			$ids = explode(',', $ids);
 			$total = count($ids);
 			
-			if( $total == 1 ) {
+			if ($total == 1) {
 				
-				acf_add_admin_notice( sprintf(__('Field group duplicated. %s', 'acf'), '<a href="' . get_edit_post_link($ids[0]) . '">' . get_the_title($ids[0]) . '</a>') );
+				acf_add_admin_notice(sprintf(__('Field group duplicated. %s', 'acf'), '<a href="'.get_edit_post_link($ids[0]).'">'.get_the_title($ids[0]).'</a>'));
 				
 			} else {
 				
-				acf_add_admin_notice( sprintf(_n( '%s field group duplicated.', '%s field groups duplicated.', $total, 'acf' ), $total) );
+				acf_add_admin_notice(sprintf(_n('%s field group duplicated.', '%s field groups duplicated.', $total, 'acf'), $total));
 				
 			}
 			
@@ -151,21 +151,21 @@ 
 		
 		
 		// import field group
-		if( $id = acf_maybe_get($_GET, 'acfduplicate') ) {
+		if ($id = acf_maybe_get($_GET, 'acfduplicate')) {
 			
 			// validate
 			check_admin_referer('bulk-posts');
 			
 			
 			// duplicate
-			$field_group = acf_duplicate_field_group( $id );
+			$field_group = acf_duplicate_field_group($id);
 			
 			
 			// redirect
-			wp_redirect( admin_url( $this->url . '&acfduplicatecomplete=' . $field_group['ID'] ) );
+			wp_redirect(admin_url($this->url.'&acfduplicatecomplete='.$field_group['ID']));
 			exit;
 			
-		} elseif( acf_maybe_get($_GET, 'action2') === 'acfduplicate' ) {
+		} elseif (acf_maybe_get($_GET, 'action2') === 'acfduplicate') {
 		
 			// validate
 			check_admin_referer('bulk-posts');
@@ -174,15 +174,15 @@ 
 			// get ids
 			$ids = acf_maybe_get($_GET, 'post');
 			
-			if( !empty($ids) ) {
+			if ( ! empty($ids)) {
 				
 				// vars
 				$new_ids = array();
 				
-				foreach( $ids as $id ) {
+				foreach ($ids as $id) {
 					
 					// duplicate
-					$field_group = acf_duplicate_field_group( $id );
+					$field_group = acf_duplicate_field_group($id);
 					
 					
 					// increase counter
@@ -192,7 +192,7 @@ 
 				
 				
 				// redirect
-				wp_redirect( admin_url( $this->url . '&acfduplicatecomplete=' . implode(',', $new_ids)) );
+				wp_redirect(admin_url($this->url.'&acfduplicatecomplete='.implode(',', $new_ids)));
 				exit;
 			}
 		
@@ -217,19 +217,19 @@ 
 	function check_sync() {
 		
 		// message
-		if( $ids = acf_maybe_get($_GET, 'acfsynccomplete') ) {
+		if ($ids = acf_maybe_get($_GET, 'acfsynccomplete')) {
 			
 			// explode
 			$ids = explode(',', $ids);
 			$total = count($ids);
 			
-			if( $total == 1 ) {
+			if ($total == 1) {
 				
-				acf_add_admin_notice( sprintf(__('Field group synchronised. %s', 'acf'), '<a href="' . get_edit_post_link($ids[0]) . '">' . get_the_title($ids[0]) . '</a>') );
+				acf_add_admin_notice(sprintf(__('Field group synchronised. %s', 'acf'), '<a href="'.get_edit_post_link($ids[0]).'">'.get_the_title($ids[0]).'</a>'));
 				
 			} else {
 				
-				acf_add_admin_notice( sprintf(_n( '%s field group synchronised.', '%s field groups synchronised.', $total, 'acf' ), $total) );
+				acf_add_admin_notice(sprintf(_n('%s field group synchronised.', '%s field groups synchronised.', $total, 'acf'), $total));
 				
 			}
 			
@@ -241,7 +241,7 @@ 
 		
 		
 		// bail early if no field groups
-		if( empty($groups) ) {
+		if (empty($groups)) {
 			
 			return;
 			
@@ -249,7 +249,7 @@ 
 		
 		
 		// find JSON field groups which have not yet been imported
-		foreach( $groups as $group ) {
+		foreach ($groups as $group) {
 			
 			// vars
 			$local = acf_maybe_get($group, 'local', false);
@@ -258,17 +258,17 @@ 
 			
 			
 			// ignore DB / PHP / private field groups
-			if( $local !== 'json' || $private ) {
+			if ($local !== 'json' || $private) {
 				
 				// do nothing
 				
-			} elseif( !$group['ID'] ) {
+			} elseif ( ! $group['ID']) {
 				
-				$this->sync[ $group['key'] ] = $group;
+				$this->sync[$group['key']] = $group;
 				
-			} elseif( $modified && $modified > get_post_modified_time('U', true, $group['ID'], true) ) {
+			} elseif ($modified && $modified > get_post_modified_time('U', true, $group['ID'], true)) {
 				
-				$this->sync[ $group['key'] ]  = $group;
+				$this->sync[$group['key']] = $group;
 				
 			}
 						
@@ -276,7 +276,7 @@ 
 		
 		
 		// bail if no sync needed
-		if( empty($this->sync) ) {
+		if (empty($this->sync)) {
 			
 			return;
 			
@@ -284,7 +284,7 @@ 
 	
 		
 		// import field group
-		if( $key = acf_maybe_get($_GET, 'acfsync') ) {
+		if ($key = acf_maybe_get($_GET, 'acfsync')) {
 			
 			// disable JSON
 			// - this prevents a new JSON file being created and causing a 'change' to theme files - solves git anoyance
@@ -296,22 +296,22 @@ 
 			
 			
 			// append fields
-			if( acf_have_local_fields( $key ) ) {
+			if (acf_have_local_fields($key)) {
 				
-				$this->sync[ $key ]['fields'] = acf_get_local_fields( $key );
+				$this->sync[$key]['fields'] = acf_get_local_fields($key);
 				
 			}
 			
 			
 			// import
-			$field_group = acf_import_field_group( $this->sync[ $key ] );
+			$field_group = acf_import_field_group($this->sync[$key]);
 			
 			
 			// redirect
-			wp_redirect( admin_url( $this->url . '&acfsynccomplete=' . $field_group['ID'] ) );
+			wp_redirect(admin_url($this->url.'&acfsynccomplete='.$field_group['ID']));
 			exit;
 			
-		} elseif( acf_maybe_get($_GET, 'action2') === 'acfsync' ) {
+		} elseif (acf_maybe_get($_GET, 'action2') === 'acfsync') {
 			
 			// validate
 			check_admin_referer('bulk-posts');
@@ -320,7 +320,7 @@ 
 			// get ids
 			$keys = acf_maybe_get($_GET, 'post');
 			
-			if( !empty($keys) ) {
+			if ( ! empty($keys)) {
 				
 				// disable JSON
 				// - this prevents a new JSON file being created and causing a 'change' to theme files - solves git anoyance
@@ -329,18 +329,18 @@ 
 				// vars
 				$new_ids = array();
 				
-				foreach( $keys as $key ) {
+				foreach ($keys as $key) {
 					
 					// append fields
-					if( acf_have_local_fields( $key ) ) {
+					if (acf_have_local_fields($key)) {
 						
-						$this->sync[ $key ]['fields'] = acf_get_local_fields( $key );
+						$this->sync[$key]['fields'] = acf_get_local_fields($key);
 						
 					}
 					
 					
 					// import
-					$field_group = acf_import_field_group( $this->sync[ $key ] );
+					$field_group = acf_import_field_group($this->sync[$key]);
 										
 					
 					// append
@@ -350,7 +350,7 @@ 
 				
 				
 				// redirect
-				wp_redirect( admin_url( $this->url . '&acfsynccomplete=' . implode(',', $new_ids)) );
+				wp_redirect(admin_url($this->url.'&acfsynccomplete='.implode(',', $new_ids)));
 				exit;
 				
 			}
@@ -377,14 +377,14 @@ 
 	*  @return	$views
 	*/
 	
-	function list_table_views( $views ) {
+	function list_table_views($views) {
 		
 		// vars
 		$class = '';
 		$total = count($this->sync);
 		
 		// active
-		if( acf_maybe_get($_GET, 'post_status') === 'sync' ) {
+		if (acf_maybe_get($_GET, 'post_status') === 'sync') {
 			
 			// actions
 			add_action('admin_footer', array($this, 'sync_admin_footer'), 5);
@@ -399,7 +399,7 @@ 
 			
 			
 			// update pagination
-			$wp_list_table->set_pagination_args( array(
+			$wp_list_table->set_pagination_args(array(
 				'total_items' => $total,
 				'total_pages' => 1,
 				'per_page' => $total
@@ -409,7 +409,7 @@ 
 		
 		
 		// add view
-		$views['json'] = '<a' . $class . ' href="' . admin_url($this->url . '&post_status=sync') . '">' . __('Sync available', 'acf') . ' <span class="count">(' . $total . ')</span></a>';
+		$views['json'] = '<a'.$class.' href="'.admin_url($this->url.'&post_status=sync').'">'.__('Sync available', 'acf').' <span class="count">('.$total.')</span></a>';
 		
 		
 		// return
@@ -431,10 +431,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function trashed_post( $post_id ) {
+	function trashed_post($post_id) {
 		
 		// validate post type
-		if( get_post_type($post_id) != 'acf-field-group' ) {
+		if (get_post_type($post_id) != 'acf-field-group') {
 		
 			return;
 		
@@ -442,7 +442,7 @@ 
 		
 		
 		// trash field group
-		acf_trash_field_group( $post_id );
+		acf_trash_field_group($post_id);
 		
 	}
 	
@@ -460,10 +460,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function untrashed_post( $post_id ) {
+	function untrashed_post($post_id) {
 		
 		// validate post type
-		if( get_post_type($post_id) != 'acf-field-group' ) {
+		if (get_post_type($post_id) != 'acf-field-group') {
 		
 			return;
 			
@@ -471,7 +471,7 @@ 
 		
 		
 		// trash field group
-		acf_untrash_field_group( $post_id );
+		acf_untrash_field_group($post_id);
 		
 	}
 	
@@ -489,10 +489,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function deleted_post( $post_id ) {
+	function deleted_post($post_id) {
 		
 		// validate post type
-		if( get_post_type($post_id) != 'acf-field-group' ) {
+		if (get_post_type($post_id) != 'acf-field-group') {
 		
 			return;
 			
@@ -500,7 +500,7 @@ 
 		
 		
 		// trash field group
-		acf_delete_field_group( $post_id );
+		acf_delete_field_group($post_id);
 		
 	}
 	
@@ -518,13 +518,13 @@ 
 	*  @return	$columns (array)
 	*/
 	
-	function field_group_columns( $columns ) {
+	function field_group_columns($columns) {
 		
 		return array(
 			'cb'	 				=> '<input type="checkbox" />',
 			'title' 				=> __('Title', 'acf'),
 			'acf-fg-description'	=> __('Description', 'acf'),
-			'acf-fg-status' 		=> '<i class="acf-icon -dot-3 small acf-js-tooltip" title="' . __('Status', 'acf') . '"></i>',
+			'acf-fg-status' 		=> '<i class="acf-icon -dot-3 small acf-js-tooltip" title="'.__('Status', 'acf').'"></i>',
 			'acf-fg-count' 			=> __('Fields', 'acf'),
 			
 		);
@@ -546,51 +546,51 @@ 
 	*  @return	n/a
 	*/
 	
-	function field_group_columns_html( $column, $post_id ) {
+	function field_group_columns_html($column, $post_id) {
 		
 		// vars
-		$field_group = acf_get_field_group( $post_id );
+		$field_group = acf_get_field_group($post_id);
 		
 		
 		// render
-		$this->render_column( $column, $field_group );
+		$this->render_column($column, $field_group);
 	    
 	}
 	
-	function render_column( $column, $field_group ) {
+	function render_column($column, $field_group) {
 		
 		// description
-		if( $column == 'acf-fg-description' ) {
+		if ($column == 'acf-fg-description') {
 			
-			if( $field_group['description'] ) {
+			if ($field_group['description']) {
 				
-				echo '<span class="acf-description">' . $field_group['description'] . '</span>';
+				echo '<span class="acf-description">'.$field_group['description'].'</span>';
 				
 			}
         
         // status
-	    } elseif( $column == 'acf-fg-status' ) {
+	    } elseif ($column == 'acf-fg-status') {
 			
-			if( isset($this->sync[ $field_group['key'] ]) ) {
+			if (isset($this->sync[$field_group['key']])) {
 				
-				echo '<i class="acf-icon -sync grey small acf-js-tooltip" title="' . __('Sync available', 'acf') .'"></i> ';
+				echo '<i class="acf-icon -sync grey small acf-js-tooltip" title="'.__('Sync available', 'acf').'"></i> ';
 				
 			}
 			
-			if( $field_group['active'] ) {
+			if ($field_group['active']) {
 				
 				//echo '<i class="acf-icon -check small acf-js-tooltip" title="' . __('Active', 'acf') .'"></i> ';
 				
 			} else {
 				
-				echo '<i class="acf-icon -minus yellow small acf-js-tooltip" title="' . __('Disabled', 'acf') . '"></i> ';
+				echo '<i class="acf-icon -minus yellow small acf-js-tooltip" title="'.__('Disabled', 'acf').'"></i> ';
 				
 			}
 	    
         // fields
-	    } elseif( $column == 'acf-fg-count' ) {
+	    } elseif ($column == 'acf-fg-count') {
 			
-			echo acf_get_field_count( $field_group );
+			echo acf_get_field_count($field_group);
         
         }
 		
@@ -621,24 +621,24 @@ 
 		<div class="inner">
 			<h2><?php echo acf_get_setting('name'); ?> <?php echo acf_get_setting('version'); ?></h2>
 
-			<h3><?php _e("Changelog",'acf'); ?></h3>
-			<p><?php _e("See what's new in",'acf'); ?> <a href="<?php echo admin_url('edit.php?post_type=acf-field-group&page=acf-settings-info&tab=changelog'); ?>"><?php _e("version",'acf'); ?> <?php echo acf_get_setting('version'); ?></a>
+			<h3><?php _e("Changelog", 'acf'); ?></h3>
+			<p><?php _e("See what's new in", 'acf'); ?> <a href="<?php echo admin_url('edit.php?post_type=acf-field-group&page=acf-settings-info&tab=changelog'); ?>"><?php _e("version", 'acf'); ?> <?php echo acf_get_setting('version'); ?></a>
 			
-			<h3><?php _e("Resources",'acf'); ?></h3>
+			<h3><?php _e("Resources", 'acf'); ?></h3>
 			<ul>
-				<li><a href="<?php echo $www; ?>#getting-started" target="_blank"><?php _e("Getting Started",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#updates" target="_blank"><?php _e("Updates",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#field-types" target="_blank"><?php _e("Field Types",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#functions" target="_blank"><?php _e("Functions",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#actions" target="_blank"><?php _e("Actions",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#filters" target="_blank"><?php _e("Filters",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#how-to" target="_blank"><?php _e("'How to' guides",'acf'); ?></a></li>
-				<li><a href="<?php echo $www; ?>#tutorials" target="_blank"><?php _e("Tutorials",'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#getting-started" target="_blank"><?php _e("Getting Started", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#updates" target="_blank"><?php _e("Updates", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#field-types" target="_blank"><?php _e("Field Types", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#functions" target="_blank"><?php _e("Functions", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#actions" target="_blank"><?php _e("Actions", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#filters" target="_blank"><?php _e("Filters", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#how-to" target="_blank"><?php _e("'How to' guides", 'acf'); ?></a></li>
+				<li><a href="<?php echo $www; ?>#tutorials" target="_blank"><?php _e("Tutorials", 'acf'); ?></a></li>
 			</ul>
 		</div>
 		<div class="footer footer-blue">
 			<ul class="acf-hl">
-				<li><?php _e("Created by",'acf'); ?> Elliot Condon</li>
+				<li><?php _e("Created by", 'acf'); ?> Elliot Condon</li>
 			</ul>
 		</div>
 	</div>
@@ -681,7 +681,7 @@ 
 			
 			
 			// create el
-			var $span = $('<span class="acf-duplicate-field-group"><a title="<?php _e('Duplicate this item', 'acf'); ?>" href="<?php echo admin_url($this->url . '&acfduplicate='); ?>' + post_id + '&_wpnonce=<?php echo wp_create_nonce('bulk-posts'); ?>"><?php _e('Duplicate', 'acf'); ?></a> | </span>');
+			var $span = $('<span class="acf-duplicate-field-group"><a title="<?php _e('Duplicate this item', 'acf'); ?>" href="<?php echo admin_url($this->url.'&acfduplicate='); ?>' + post_id + '&_wpnonce=<?php echo wp_create_nonce('bulk-posts'); ?>"><?php _e('Duplicate', 'acf'); ?></a> | </span>');
 			
 			
 			// replace
@@ -697,7 +697,7 @@ 
 	
 	
 	// modify bulk actions
-	$('#bulk-action-selector-bottom option[value="edit"]').attr('value','acfduplicate').text('<?php _e( 'Duplicate', 'acf' ); ?>');
+	$('#bulk-action-selector-bottom option[value="edit"]').attr('value','acfduplicate').text('<?php _e('Duplicate', 'acf'); ?>');
 	
 	
 	// clean up table
@@ -740,10 +740,10 @@ 
 		
 ?>
 <script type="text/html" id="tmpl-acf-json-tbody">
-<?php foreach( $this->sync as $field_group ): $i++; ?>
-	<tr <?php if($i%2 == 0): ?>class="alternate"<?php endif; ?>>
+<?php foreach ($this->sync as $field_group): $i++; ?>
+	<tr <?php if ($i % 2 == 0): ?>class="alternate"<?php endif; ?>>
 		<th class="check-column" scope="row">
-			<label for="cb-select-<?php echo $field_group['key']; ?>" class="screen-reader-text"><?php printf( __( 'Select %s', 'acf' ), $field_group['title'] ); ?></label>
+			<label for="cb-select-<?php echo $field_group['key']; ?>" class="screen-reader-text"><?php printf(__('Select %s', 'acf'), $field_group['title']); ?></label>
 			<input type="checkbox" value="<?php echo $field_group['key']; ?>" name="post[]" id="cb-select-<?php echo $field_group['key']; ?>">
 		</th>
 		<td class="post-title page-title column-title">
@@ -751,11 +751,11 @@ 
 				<span class="row-title"><?php echo $field_group['title']; ?></span><span class="acf-description"><?php echo $field_group['key']; ?>.json</span>
 			</strong>
 			<div class="row-actions">
-				<span class="import"><a title="<?php echo esc_attr( __('Synchronise field group', 'acf') ); ?>" href="<?php echo admin_url($this->url . '&post_status=sync&acfsync=' . $field_group['key'] . '&_wpnonce=' . wp_create_nonce('bulk-posts')); ?>"><?php _e( 'Sync', 'acf' ); ?></a></span>
+				<span class="import"><a title="<?php echo esc_attr(__('Synchronise field group', 'acf')); ?>" href="<?php echo admin_url($this->url.'&post_status=sync&acfsync='.$field_group['key'].'&_wpnonce='.wp_create_nonce('bulk-posts')); ?>"><?php _e('Sync', 'acf'); ?></a></span>
 			</div>
 		</td>
-		<?php foreach( $columns as $column ): ?>
-			<td class="column-<?php echo $column; ?>"><?php $this->render_column( $column, $field_group ); ?></td>
+		<?php foreach ($columns as $column): ?>
+			<td class="column-<?php echo $column; ?>"><?php $this->render_column($column, $field_group); ?></td>
 		<?php endforeach; ?>
 	</tr>
 <?php endforeach; ?>

includes/acf/admin/settings-addons.php

Indentation +11 added lines, -11 removed lines

@@ -79,17 +79,17 @@
 
 
 		// load json
-        $request = wp_remote_post( 'http://assets.advancedcustomfields.com/add-ons/add-ons.json' );
-
-        // validate
-        if( is_wp_error($request) || wp_remote_retrieve_response_code($request) != 200)
-        {
-        	acf_add_admin_notice(__('<b>Error</b>. Could not load add-ons list', 'acf'), 'error');
-        }
-        else
-        {
-	        $this->view['json'] = json_decode( $request['body'], true );
-        }
+		$request = wp_remote_post( 'http://assets.advancedcustomfields.com/add-ons/add-ons.json' );
+
+		// validate
+		if( is_wp_error($request) || wp_remote_retrieve_response_code($request) != 200)
+		{
+			acf_add_admin_notice(__('<b>Error</b>. Could not load add-ons list', 'acf'), 'error');
+		}
+		else
+		{
+			$this->view['json'] = json_decode( $request['body'], true );
+		}
 
 	}
 

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 	function __construct() {
 
 		// actions
-		add_action( 'admin_menu', 				array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 	}
 
 
@@ -41,18 +41,18 @@ 
 	function admin_menu() {
 
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') )
+		if ( ! acf_get_setting('show_admin'))
 		{
 			return;
 		}
 
 
 		// add page
-		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Add-ons','acf'), __('Add-ons','acf'), acf_get_setting('capability'),'acf-settings-addons', array($this,'html') );
+		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Add-ons', 'acf'), __('Add-ons', 'acf'), acf_get_setting('capability'), 'acf-settings-addons', array($this, 'html'));
 
 
 		// actions
-		add_action('load-' . $page, array($this,'load'));
+		add_action('load-'.$page, array($this, 'load'));
 
 	}
 
@@ -79,16 +79,16 @@ 
 
 
 		// load json
-        $request = wp_remote_post( 'http://assets.advancedcustomfields.com/add-ons/add-ons.json' );
+        $request = wp_remote_post('http://assets.advancedcustomfields.com/add-ons/add-ons.json');
 
         // validate
-        if( is_wp_error($request) || wp_remote_retrieve_response_code($request) != 200)
+        if (is_wp_error($request) || wp_remote_retrieve_response_code($request) != 200)
         {
         	acf_add_admin_notice(__('<b>Error</b>. Could not load add-ons list', 'acf'), 'error');
         }
         else
         {
-	        $this->view['json'] = json_decode( $request['body'], true );
+	        $this->view['json'] = json_decode($request['body'], true);
         }
 
 	}

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
         if( is_wp_error($request) || wp_remote_retrieve_response_code($request) != 200)
         {
         	acf_add_admin_notice(__('<b>Error</b>. Could not load add-ons list', 'acf'), 'error');
-        }
-        else
+        } else
         {
 	        $this->view['json'] = json_decode( $request['body'], true );
         }

includes/acf/admin/settings-info.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 	function __construct() {
 
 		// actions
-		add_action('admin_menu',	array($this, 'admin_menu'));
+		add_action('admin_menu', array($this, 'admin_menu'));
 		
 	}
 
@@ -39,7 +39,7 @@ 
 	function admin_menu() {
 
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 		
 			return;
 			
@@ -47,7 +47,7 @@ 
 
 
 		// add page
-		add_submenu_page('edit.php?post_type=acf-field-group', __('Info','acf'), __('Info','acf'), acf_get_setting('capability'),'acf-settings-info', array($this,'html'));
+		add_submenu_page('edit.php?post_type=acf-field-group', __('Info', 'acf'), __('Info', 'acf'), acf_get_setting('capability'), 'acf-settings-info', array($this, 'html'));
 
 	}
 
@@ -80,7 +80,7 @@ 
 		
 		
 		// set active tab
-		if( !empty($_GET['tab']) && array_key_exists($_GET['tab'], $view['tabs']) ) {
+		if ( ! empty($_GET['tab']) && array_key_exists($_GET['tab'], $view['tabs'])) {
 			
 			$view['active'] = $_GET['tab'];
 			

includes/acf/admin/settings-tools.php

Indentation +33 added lines, -33 removed lines

@@ -222,41 +222,41 @@ 
 		
 		
 		// validate json
-    	if( empty($json) ) {
+		if( empty($json) ) {
     	
-    		acf_add_admin_notice(__('Import file empty', 'acf'), 'error');
-	    	return;
+			acf_add_admin_notice(__('Import file empty', 'acf'), 'error');
+			return;
     	
-    	}
+		}
     	
     	
-    	// if importing an auto-json, wrap field group in array
-    	if( isset($json['key']) ) {
+		// if importing an auto-json, wrap field group in array
+		if( isset($json['key']) ) {
 	    	
-	    	$json = array( $json );
+			$json = array( $json );
 	    	
-    	}
+		}
     	
     	
-    	// vars
-    	$added = array();
-    	$ignored = array();
-    	$ref = array();
-    	$order = array();
+		// vars
+		$added = array();
+		$ignored = array();
+		$ref = array();
+		$order = array();
     	
-    	foreach( $json as $field_group ) {
+		foreach( $json as $field_group ) {
     		
-	    	// check if field group exists
-	    	if( acf_get_field_group($field_group['key'], true) ) {
+			// check if field group exists
+			if( acf_get_field_group($field_group['key'], true) ) {
 	    		
-	    		// append to ignored
-	    		$ignored[] = $field_group['title'];
-	    		continue;
+				// append to ignored
+				$ignored[] = $field_group['title'];
+				continue;
 	    	
-	    	}
+			}
 	    	
 	    	
-	    	// remove fields
+			// remove fields
 			$fields = acf_extract_var($field_group, 'fields');
 			
 			
@@ -314,27 +314,27 @@ 
 			// append to added
 			$added[] = '<a href="' . admin_url("post.php?post={$field_group['ID']}&action=edit") . '" target="_blank">' . $field_group['title'] . '</a>';
 			
-    	}
+		}
     	
     	
-    	// messages
-    	if( !empty($added) ) {
+		// messages
+		if( !empty($added) ) {
     		
-    		$message = __('<b>Success</b>. Import tool added %s field groups: %s', 'acf');
-    		$message = sprintf( $message, count($added), implode(', ', $added) );
+			$message = __('<b>Success</b>. Import tool added %s field groups: %s', 'acf');
+			$message = sprintf( $message, count($added), implode(', ', $added) );
     		
-	    	acf_add_admin_notice( $message );
+			acf_add_admin_notice( $message );
     	
-    	}
+		}
     	
-    	if( !empty($ignored) ) {
+		if( !empty($ignored) ) {
     		
-    		$message = __('<b>Warning</b>. Import tool detected %s field groups already exist and have been ignored: %s', 'acf');
-    		$message = sprintf( $message, count($ignored), implode(', ', $ignored) );
+			$message = __('<b>Warning</b>. Import tool detected %s field groups already exist and have been ignored: %s', 'acf');
+			$message = sprintf( $message, count($ignored), implode(', ', $ignored) );
     		
-	    	acf_add_admin_notice( $message, 'error' );
+			acf_add_admin_notice( $message, 'error' );
     	
-    	}
+		}
     	
 		
 	}

Spacing +57 added lines, -57 removed lines

@@ -43,7 +43,7 @@ 
 	function admin_menu() {
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 			
@@ -51,11 +51,11 @@ 
 		
 		
 		// add page
-		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Tools','acf'), __('Tools','acf'), acf_get_setting('capability'),'acf-settings-tools', array($this,'html') );
+		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Tools', 'acf'), __('Tools', 'acf'), acf_get_setting('capability'), 'acf-settings-tools', array($this, 'html'));
 		
 		
 		// actions
-		add_action('load-' . $page, array($this,'load'));
+		add_action('load-'.$page, array($this, 'load'));
 		
 	}
 	
@@ -80,13 +80,13 @@ 
 		
 		
 		// run import / export
-		if( acf_verify_nonce('import') ) {
+		if (acf_verify_nonce('import')) {
 			
 			$this->import();
 		
-		} elseif( acf_verify_nonce('export') ) {
+		} elseif (acf_verify_nonce('export')) {
 			
-			if( isset($_POST['generate']) ) {
+			if (isset($_POST['generate'])) {
 				
 				$this->generate();
 			
@@ -146,22 +146,22 @@ 
 		
 		
 		// validate
-		if( $json === false ) {
+		if ($json === false) {
 			
-			acf_add_admin_notice( __("No field groups selected", 'acf') , 'error');
+			acf_add_admin_notice(__("No field groups selected", 'acf'), 'error');
 			return;
 		
 		}
 		
 		
 		// set headers
-		$file_name = 'acf-export-' . date('Y-m-d') . '.json';
+		$file_name = 'acf-export-'.date('Y-m-d').'.json';
 		
-		header( "Content-Description: File Transfer" );
-		header( "Content-Disposition: attachment; filename={$file_name}" );
-		header( "Content-Type: application/json; charset=utf-8" );
+		header("Content-Description: File Transfer");
+		header("Content-Disposition: attachment; filename={$file_name}");
+		header("Content-Type: application/json; charset=utf-8");
 		
-		echo acf_json_encode( $json );
+		echo acf_json_encode($json);
 		die;
 		
 	}
@@ -183,9 +183,9 @@ 
 	function import() {
 		
 		// validate
-		if( empty($_FILES['acf_import_file']) ) {
+		if (empty($_FILES['acf_import_file'])) {
 			
-			acf_add_admin_notice( __("No file selected", 'acf') , 'error');
+			acf_add_admin_notice(__("No file selected", 'acf'), 'error');
 			return;
 		
 		}
@@ -196,7 +196,7 @@ 
 		
 		
 		// validate error
-		if( $file['error'] ) {
+		if ($file['error']) {
 			
 			acf_add_admin_notice(__('Error uploading file. Please try again', 'acf'), 'error');
 			return;
@@ -205,7 +205,7 @@ 
 		
 		
 		// validate type
-		if( pathinfo($file['name'], PATHINFO_EXTENSION) !== 'json' ) {
+		if (pathinfo($file['name'], PATHINFO_EXTENSION) !== 'json') {
 		
 			acf_add_admin_notice(__('Incorrect file type', 'acf'), 'error');
 			return;
@@ -214,7 +214,7 @@ 
 		
 		
 		// read file
-		$json = file_get_contents( $file['tmp_name'] );
+		$json = file_get_contents($file['tmp_name']);
 		
 		
 		// decode json
@@ -222,7 +222,7 @@ 
 		
 		
 		// validate json
-    	if( empty($json) ) {
+    	if (empty($json)) {
     	
     		acf_add_admin_notice(__('Import file empty', 'acf'), 'error');
 	    	return;
@@ -231,9 +231,9 @@ 
     	
     	
     	// if importing an auto-json, wrap field group in array
-    	if( isset($json['key']) ) {
+    	if (isset($json['key'])) {
 	    	
-	    	$json = array( $json );
+	    	$json = array($json);
 	    	
     	}
     	
@@ -244,10 +244,10 @@ 
     	$ref = array();
     	$order = array();
     	
-    	foreach( $json as $field_group ) {
+    	foreach ($json as $field_group) {
     		
 	    	// check if field group exists
-	    	if( acf_get_field_group($field_group['key'], true) ) {
+	    	if (acf_get_field_group($field_group['key'], true)) {
 	    		
 	    		// append to ignored
 	    		$ignored[] = $field_group['title'];
@@ -261,78 +261,78 @@ 
 			
 			
 			// format fields
-			$fields = acf_prepare_fields_for_import( $fields );
+			$fields = acf_prepare_fields_for_import($fields);
 			
 			
 			// save field group
-			$field_group = acf_update_field_group( $field_group );
+			$field_group = acf_update_field_group($field_group);
 			
 			
 			// add to ref
-			$ref[ $field_group['key'] ] = $field_group['ID'];
+			$ref[$field_group['key']] = $field_group['ID'];
 			
 			
 			// add to order
-			$order[ $field_group['ID'] ] = 0;
+			$order[$field_group['ID']] = 0;
 			
 			
 			// add fields
-			foreach( $fields as $field ) {
+			foreach ($fields as $field) {
 				
 				// add parent
-				if( empty($field['parent']) ) {
+				if (empty($field['parent'])) {
 					
 					$field['parent'] = $field_group['ID'];
 					
-				} elseif( isset($ref[ $field['parent'] ]) ) {
+				} elseif (isset($ref[$field['parent']])) {
 					
-					$field['parent'] = $ref[ $field['parent'] ];
+					$field['parent'] = $ref[$field['parent']];
 						
 				}
 				
 				
 				// add field menu_order
-				if( !isset($order[ $field['parent'] ]) ) {
+				if ( ! isset($order[$field['parent']])) {
 					
-					$order[ $field['parent'] ] = 0;
+					$order[$field['parent']] = 0;
 					
 				}
 				
-				$field['menu_order'] = $order[ $field['parent'] ];
-				$order[ $field['parent'] ]++;
+				$field['menu_order'] = $order[$field['parent']];
+				$order[$field['parent']]++;
 				
 				
 				// save field
-				$field = acf_update_field( $field );
+				$field = acf_update_field($field);
 				
 				
 				// add to ref
-				$ref[ $field['key'] ] = $field['ID'];
+				$ref[$field['key']] = $field['ID'];
 				
 			}
 			
 			// append to added
-			$added[] = '<a href="' . admin_url("post.php?post={$field_group['ID']}&action=edit") . '" target="_blank">' . $field_group['title'] . '</a>';
+			$added[] = '<a href="'.admin_url("post.php?post={$field_group['ID']}&action=edit").'" target="_blank">'.$field_group['title'].'</a>';
 			
     	}
     	
     	
     	// messages
-    	if( !empty($added) ) {
+    	if ( ! empty($added)) {
     		
     		$message = __('<b>Success</b>. Import tool added %s field groups: %s', 'acf');
-    		$message = sprintf( $message, count($added), implode(', ', $added) );
+    		$message = sprintf($message, count($added), implode(', ', $added));
     		
-	    	acf_add_admin_notice( $message );
+	    	acf_add_admin_notice($message);
     	
     	}
     	
-    	if( !empty($ignored) ) {
+    	if ( ! empty($ignored)) {
     		
     		$message = __('<b>Warning</b>. Import tool detected %s field groups already exist and have been ignored: %s', 'acf');
-    		$message = sprintf( $message, count($ignored), implode(', ', $ignored) );
+    		$message = sprintf($message, count($ignored), implode(', ', $ignored));
     		
-	    	acf_add_admin_notice( $message, 'error' );
+	    	acf_add_admin_notice($message, 'error');
     	
     	}
     	
@@ -356,15 +356,15 @@ 
 	function generate() {
 		
 		// translate
-		if( acf_get_setting('l10n_textdomain') ) {
+		if (acf_get_setting('l10n_textdomain')) {
 			
 			// prevent default translation
 			acf_update_setting('l10n_var_export', true);
 						
 			
 			// filters
-			add_filter('acf/prepare_field_group_for_export', 	array($this, '_translate_field_group'));
-			add_filter('acf/prepare_field_for_export', 			array($this, '_translate_field'));
+			add_filter('acf/prepare_field_group_for_export', array($this, '_translate_field_group'));
+			add_filter('acf/prepare_field_for_export', array($this, '_translate_field'));
 		
 		}
 		
@@ -374,9 +374,9 @@ 
 		
 		
 		// validate
-		if( $json === false ) {
+		if ($json === false) {
 			
-			acf_add_admin_notice( __("No field groups selected", 'acf') , 'error');
+			acf_add_admin_notice(__("No field groups selected", 'acf'), 'error');
 			return;
 		
 		}
@@ -388,13 +388,13 @@ 
 		
 	}
 	
-	function _translate_field( $field ) {
+	function _translate_field($field) {
 		
 		return acf_translate_keys($field, acf_get_setting('l10n_field'));
 		
 	}
 	
-	function _translate_field_group( $field_group ) {
+	function _translate_field_group($field_group) {
 		
 		return acf_translate_keys($field_group, acf_get_setting('l10n_field_group'));
 		
@@ -417,7 +417,7 @@ 
 	function get_json() {
 		
 		// validate
-		if( empty($_POST['acf_export_keys']) ) {
+		if (empty($_POST['acf_export_keys'])) {
 			
 			return false;
 				
@@ -429,22 +429,22 @@ 
 		
 		
 		// construct JSON
-		foreach( $_POST['acf_export_keys'] as $key ) {
+		foreach ($_POST['acf_export_keys'] as $key) {
 			
 			// load field group
-			$field_group = acf_get_field_group( $key );
+			$field_group = acf_get_field_group($key);
 			
 			
 			// validate field group
-			if( empty($field_group) ) continue;
+			if (empty($field_group)) continue;
 			
 			
 			// load fields
-			$field_group['fields'] = acf_get_fields( $field_group );
+			$field_group['fields'] = acf_get_fields($field_group);
 	
 	
 			// prepare for export
-			$field_group = acf_prepare_field_group_for_export( $field_group );
+			$field_group = acf_prepare_field_group_for_export($field_group);
 			
 			
 			// add to json array

Braces +3 added lines, -1 removed lines

@@ -436,7 +436,9 @@
 			
 			
 			// validate field group
-			if( empty($field_group) ) continue;
+			if( empty($field_group) ) {
+				continue;
+			}
 			
 			
 			// load fields

includes/acf/admin/update.php

Spacing +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Admin
 */
 
-if( ! class_exists('acf_admin_update') ) :
+if ( ! class_exists('acf_admin_update')) :
 
 class acf_admin_update {
 
@@ -29,12 +29,12 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_menu', 						array($this,'admin_menu'), 20);
-		add_action('network_admin_menu', 				array($this,'network_admin_menu'), 20);
+		add_action('admin_menu', array($this, 'admin_menu'), 20);
+		add_action('network_admin_menu', array($this, 'network_admin_menu'), 20);
 		
 		
 		// ajax
-		add_action('wp_ajax_acf/admin/data_upgrade',	array($this, 'ajax_upgrade'));
+		add_action('wp_ajax_acf/admin/data_upgrade', array($this, 'ajax_upgrade'));
 		
 	}
 	
@@ -55,7 +55,7 @@ 
 	function network_admin_menu() {
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 		
@@ -69,12 +69,12 @@ 
 		// loop through sites and find updates
 		$sites = wp_get_sites();
 		
-		if( $sites ) {
+		if ($sites) {
 			
-			foreach( $sites as $site ) {
+			foreach ($sites as $site) {
 				
 				// switch blog
-				switch_to_blog( $site['blog_id'] );
+				switch_to_blog($site['blog_id']);
 				
 				
 				// get site updates
@@ -85,7 +85,7 @@ 
 				restore_current_blog();
 				
 				
-				if( $updates ) {
+				if ($updates) {
 				
 					$prompt = true;
 					break;
@@ -98,7 +98,7 @@ 
 		
 		
 		// bail if no prompt
-		if( !$prompt ) {
+		if ( ! $prompt) {
 			
 			return;
 			
@@ -110,7 +110,7 @@ 
 		
 		
 		// add page
-		add_submenu_page('update-core.php', __('Upgrade ACF','acf'), __('Upgrade ACF','acf'), acf_get_setting('capability'),'acf-upgrade', array($this,'network_html'));
+		add_submenu_page('update-core.php', __('Upgrade ACF', 'acf'), __('Upgrade ACF', 'acf'), acf_get_setting('capability'), 'acf-upgrade', array($this, 'network_html'));
 		
 	}
 	
@@ -131,7 +131,7 @@ 
 	function network_admin_notices() {
 		
 		// bail ealry if already on update page
-		if( acf_is_screen('admin_page_acf-upgrade-network') ) {
+		if (acf_is_screen('admin_page_acf-upgrade-network')) {
 			
 			return;
 			
@@ -174,12 +174,12 @@ 
 		// loop through sites and find updates
 		$sites = wp_get_sites();
 		
-		if( $sites ) {
+		if ($sites) {
 			
-			foreach( $sites as $i => $site ) {
+			foreach ($sites as $i => $site) {
 				
 				// switch blog
-				switch_to_blog( $site['blog_id'] );
+				switch_to_blog($site['blog_id']);
 				
 				
 				// extra info
@@ -196,7 +196,7 @@ 
 				
 				
 				// no value equals new instal
-				if( !$site['acf_version'] ) {
+				if ( ! $site['acf_version']) {
 					
 					$site['acf_version'] = $plugin_version;
 					
@@ -204,7 +204,7 @@ 
 				
 				
 				// update
-				$sites[ $i ] = $site;
+				$sites[$i] = $site;
 				
 				
 				// restore
@@ -253,16 +253,16 @@ 
 
 		
 		// bail early if a new install
-		if( !$acf_version ) {
+		if ( ! $acf_version) {
 		
-			update_option('acf_version', $plugin_version );
+			update_option('acf_version', $plugin_version);
 			return;
 			
 		}
 		
 		
 		// bail early if $acf_version is >= $plugin_version
-		if( version_compare( $acf_version, $plugin_version, '>=') ) {
+		if (version_compare($acf_version, $plugin_version, '>=')) {
 		
 			return;
 			
@@ -274,16 +274,16 @@ 
 		
 		
 		// bail early if no updates available
-		if( empty($updates) ) {
+		if (empty($updates)) {
 			
-			update_option('acf_version', $plugin_version );
+			update_option('acf_version', $plugin_version);
 			return;
 			
 		}
 		
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 		
@@ -295,7 +295,7 @@ 
 		
 		
 		// add page
-		add_submenu_page('edit.php?post_type=acf-field-group', __('Upgrade','acf'), __('Upgrade','acf'), acf_get_setting('capability'),'acf-upgrade', array($this,'html') );
+		add_submenu_page('edit.php?post_type=acf-field-group', __('Upgrade', 'acf'), __('Upgrade', 'acf'), acf_get_setting('capability'), 'acf-upgrade', array($this, 'html'));
 		
 	}
 	
@@ -316,7 +316,7 @@ 
 	function admin_notices() {
 		
 		// bail ealry if already on update page
-		if( acf_is_screen('custom-fields_page_acf-upgrade') ) {
+		if (acf_is_screen('custom-fields_page_acf-upgrade')) {
 			
 			return;
 			
@@ -384,14 +384,14 @@ 
 	function ajax_upgrade() {
 		
    		// options
-   		$options = wp_parse_args( $_POST, array(
+   		$options = wp_parse_args($_POST, array(
 			'nonce'		=> '',
 			'blog_id'	=> '',
 		));
 		
 		
 		// validate
-		if( !wp_verify_nonce($options['nonce'], 'acf_upgrade') ) {
+		if ( ! wp_verify_nonce($options['nonce'], 'acf_upgrade')) {
 		
 			wp_send_json_error();
 			
@@ -399,9 +399,9 @@ 
 		
 		
 		// switch blog
-		if( $options['blog_id'] ) { 
+		if ($options['blog_id']) { 
 			
-			switch_to_blog( $options['blog_id'] );
+			switch_to_blog($options['blog_id']);
 			
 		}
 		
@@ -412,7 +412,7 @@ 
 		
 		
 		// bail early if no updates
-		if( empty($updates) ) {
+		if (empty($updates)) {
 			
 			wp_send_json_error(array(
 				'message' => 'No updates available'
@@ -422,14 +422,14 @@ 
 		
 		
 		// install updates
-		foreach( $updates as $version ) {
+		foreach ($updates as $version) {
 			
 			// get path
 			$path = acf_get_path("admin/updates/{$version}.php");
 			
 			
 			// load version
-			if( !file_exists($path) ) {
+			if ( ! file_exists($path)) {
 			
 				wp_send_json_error(array(
 					'message' => 'Error loading update'
@@ -443,15 +443,15 @@ 
 			
 			
 			// action for 3rd party
-			do_action('acf/upgrade_start/' . $version );
+			do_action('acf/upgrade_start/'.$version);
 			
 			
 			// include
-			include( $path );
+			include($path);
 			
 			
 			// action for 3rd party
-			do_action('acf/upgrade_finish/' . $version );
+			do_action('acf/upgrade_finish/'.$version);
 			
 			
 			// get feedback
@@ -459,7 +459,7 @@ 
 			
 			
 			// update successful
-			update_option('acf_version', $version );
+			update_option('acf_version', $version);
 		
 		}
 		

includes/acf/admin/updates/5.0.0.php

Spacing +44 added lines, -44 removed lines

@@ -12,7 +12,7 @@ 
 */
 
 // Exit if accessed directly
-if( !defined('ABSPATH') ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 
 // global
@@ -30,25 +30,25 @@ 
 
 
 // populate acfs
-if( $ofgs ){ foreach( $ofgs as $ofg ){
+if ($ofgs) { foreach ($ofgs as $ofg) {
 	
 	// migrate field group
-	$nfg = _migrate_field_group_500( $ofg );
+	$nfg = _migrate_field_group_500($ofg);
 	
 	
 	// get field from postmeta
-	$rows = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key LIKE %s", $ofg->ID, 'field_%'), ARRAY_A);
+	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key LIKE %s", $ofg->ID, 'field_%'), ARRAY_A);
 	
 	
-	if( $rows )
+	if ($rows)
 	{
 		$nfg['fields'] = array();
 		
-		foreach( $rows as $row )
+		foreach ($rows as $row)
 		{
 			$field = $row['meta_value'];
-			$field = maybe_unserialize( $field );
-			$field = maybe_unserialize( $field ); // run again for WPML
+			$field = maybe_unserialize($field);
+			$field = maybe_unserialize($field); // run again for WPML
 			
 			
 			// add parent
@@ -56,7 +56,7 @@ 
 			
 			
 			// migrate field
-			$field = _migrate_field_500( $field );
+			$field = _migrate_field_500($field);
 		}
  	}
  		
@@ -76,7 +76,7 @@ 
 *  @return	$post_id (int)
 */
 
-function _migrate_field_group_500( $ofg ) {
+function _migrate_field_group_500($ofg) {
 	
 	// global
 	global $wpdb;
@@ -101,11 +101,11 @@ 
 	// get all rules
  	$rules = get_post_meta($ofg->ID, 'rule', false);
  	
- 	if( is_array($rules) ) {
+ 	if (is_array($rules)) {
  	
  		$group_no = 0;
  		
-	 	foreach( $rules as $rule ) {
+	 	foreach ($rules as $rule) {
 	 		
 	 		// if field group was duplicated, it may now be a serialized string!
 	 		$rule = maybe_unserialize($rule);
@@ -113,12 +113,12 @@ 
 	 		
 		 	// does this rule have a group?
 		 	// + groups were added in 4.0.4
-		 	if( !isset($rule['group_no']) ) {
+		 	if ( ! isset($rule['group_no'])) {
 		 	
 			 	$rule['group_no'] = $group_no;
 			 	
 			 	// sperate groups?
-			 	if( get_post_meta($ofg->ID, 'allorany', true) == 'any' ) {
+			 	if (get_post_meta($ofg->ID, 'allorany', true) == 'any') {
 			 	
 				 	$group_no++;
 				 	
@@ -128,40 +128,40 @@ 
 		 	
 		 	
 		 	// extract vars
-		 	$group = acf_extract_var( $rule, 'group_no' );
-		 	$order = acf_extract_var( $rule, 'order_no' );
+		 	$group = acf_extract_var($rule, 'group_no');
+		 	$order = acf_extract_var($rule, 'order_no');
 		 	
 		 	
 		 	// add to group
-		 	$groups[ $group ][ $order ] = $rule;
+		 	$groups[$group][$order] = $rule;
 		 	
 		 	
 		 	// sort rules
-		 	ksort( $groups[ $group ] );
+		 	ksort($groups[$group]);
  	
 	 	}
 	 	
 	 	// sort groups
-		ksort( $groups );
+		ksort($groups);
  	}
  	
  	$nfg['location'] = $groups;
  	
  	
 	// settings
- 	if( $position = get_post_meta($ofg->ID, 'position', true) ) {
+ 	if ($position = get_post_meta($ofg->ID, 'position', true)) {
  	
 		$nfg['position'] = $position;
 		
 	}
 	
- 	if( $layout = get_post_meta($ofg->ID, 'layout', true) ) {
+ 	if ($layout = get_post_meta($ofg->ID, 'layout', true)) {
  	
 		$nfg['layout'] = $layout;
 		
 	}
 	
- 	if( $hide_on_screen = get_post_meta($ofg->ID, 'hide_on_screen', true) ) {
+ 	if ($hide_on_screen = get_post_meta($ofg->ID, 'hide_on_screen', true)) {
  	
 		$nfg['hide_on_screen'] = maybe_unserialize($hide_on_screen);
 		
@@ -176,13 +176,13 @@ 
 	
 	
 	// save field group
-	$nfg = acf_update_field_group( $nfg );
+	$nfg = acf_update_field_group($nfg);
 	
 	
 	// trash?
-	if( $post_status == 'trash' ) {
+	if ($post_status == 'trash') {
 		
-		acf_trash_field_group( $nfg['ID'] );
+		acf_trash_field_group($nfg['ID']);
 		
 	}
 	
@@ -205,60 +205,60 @@ 
 *  @return	$post_id (int)
 */
 
-function _migrate_field_500( $field ) {
+function _migrate_field_500($field) {
 	
 	// orig
 	$orig = $field;
 	
 	
 	// order_no is now menu_order
-	$field['menu_order'] = acf_extract_var( $field, 'order_no' );
+	$field['menu_order'] = acf_extract_var($field, 'order_no');
 	
 	
 	// correct very old field keys
-	if( substr($field['key'], 0, 6) !== 'field_' ) {
+	if (substr($field['key'], 0, 6) !== 'field_') {
 	
-		$field['key'] = 'field_' . str_replace('field', '', $field['key']);
+		$field['key'] = 'field_'.str_replace('field', '', $field['key']);
 		
 	}
 	
 	
 	// get valid field
-	$field = acf_get_valid_field( $field );
+	$field = acf_get_valid_field($field);
 	
 	
 	// save field
-	$field = acf_update_field( $field );
+	$field = acf_update_field($field);
 	
 	
 	// sub fields
-	if( $field['type'] == 'repeater' ) {
+	if ($field['type'] == 'repeater') {
 		
 		// get sub fields
-		$sub_fields = acf_extract_var( $orig, 'sub_fields' );
+		$sub_fields = acf_extract_var($orig, 'sub_fields');
 		
 		
 		// save sub fields
-		if( !empty($sub_fields) ) {
+		if ( ! empty($sub_fields)) {
 			
 			$keys = array_keys($sub_fields);
 		
-			foreach( $keys as $key ) {
+			foreach ($keys as $key) {
 			
 				$sub_field = acf_extract_var($sub_fields, $key);
 				$sub_field['parent'] = $field['ID'];
 				
-				_migrate_field_500( $sub_field );
+				_migrate_field_500($sub_field);
 				
 			}
 			
 		}
 		
 	
-	} elseif( $field['type'] == 'flexible_content' ) {
+	} elseif ($field['type'] == 'flexible_content') {
 		
 		// get layouts
-		$layouts = acf_extract_var( $orig, 'layouts' );
+		$layouts = acf_extract_var($orig, 'layouts');
 		
 		
 		// update layouts
@@ -266,9 +266,9 @@ 
 		
 		
 		// save sub fields
-		if( !empty($layouts) ) {
+		if ( ! empty($layouts)) {
 			
-			foreach( $layouts as $layout ) {
+			foreach ($layouts as $layout) {
 				
 				// vars
 				$layout_key = uniqid();
@@ -283,17 +283,17 @@ 
 				
 				
 				// save sub fields
-				if( !empty($sub_fields) ) {
+				if ( ! empty($sub_fields)) {
 					
 					$keys = array_keys($sub_fields);
 					
-					foreach( $keys as $key ) {
+					foreach ($keys as $key) {
 					
 						$sub_field = acf_extract_var($sub_fields, $key);
 						$sub_field['parent'] = $field['ID'];
 						$sub_field['parent_layout'] = $layout_key;
 						
-						_migrate_field_500( $sub_field );
+						_migrate_field_500($sub_field);
 						
 					}
 					// foreach
@@ -313,7 +313,7 @@ 
 		
 		
 		// save field again with less sub field data
-		$field = acf_update_field( $field );
+		$field = acf_update_field($field);
 		
 	}
 	

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 */
 
 // Exit if accessed directly
-if( !defined('ABSPATH') ) exit;
+if( !defined('ABSPATH') ) {
+	exit;
+}
 
 
 // global

includes/acf/admin/views/field-group-field-conditional-logic.php

Spacing +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php 
 
 // vars
-$field = acf_extract_var( $args, 'field');
-$groups = acf_extract_var( $field, 'conditional_logic');
+$field = acf_extract_var($args, 'field');
+$groups = acf_extract_var($field, 'conditional_logic');
 $disabled = empty($groups) ? 1 : 0;
 
 
 // UI needs at least 1 conditional logic rule
-if( empty($groups) ) {
+if (empty($groups)) {
 	
 	$groups = array(
 		
@@ -26,7 +26,7 @@ 
 ?>
 <tr data-name="conditional_logic" class="acf-field">
 	<td class="acf-label">
-		<label><?php _e("Conditional Logic",'acf'); ?></label>
+		<label><?php _e("Conditional Logic", 'acf'); ?></label>
 	</td>
 	<td class="acf-input">
 		<?php 
@@ -37,20 +37,20 @@ 
 			'prefix'		=> $field['prefix'],
 			'value'			=> $disabled ? 0 : 1,
 			'choices'		=> array(
-								1	=> __("Yes",'acf'),
-								0	=> __("No",'acf'),
+								1	=> __("Yes", 'acf'),
+								0	=> __("No", 'acf'),
 			),
 			'layout'		=> 'horizontal',
 			'class'			=> 'conditional-toggle'
 		));
 		
 		?>
-		<div class="rule-groups" <?php if($disabled): ?>style="display:none;"<?php endif; ?>>
+		<div class="rule-groups" <?php if ($disabled): ?>style="display:none;"<?php endif; ?>>
 			
-			<?php foreach( $groups as $group_id => $group ): 
+			<?php foreach ($groups as $group_id => $group): 
 				
 				// validate
-				if( empty($group) ) {
+				if (empty($group)) {
 				
 					continue;
 					
@@ -59,7 +59,7 @@ 
 				// vars
 				// $group_id must be completely different to $rule_id to avoid JS issues
 				$group_id = "group_{$group_id}";
-				$h4 = ($group_id == "group_0") ? __("Show this field if",'acf') : __("or",'acf');
+				$h4 = ($group_id == "group_0") ? __("Show this field if", 'acf') : __("or", 'acf');
 				
 				?>
 				<div class="rule-group" data-id="<?php echo $group_id; ?>">
@@ -68,10 +68,10 @@ 
 					
 					<table class="acf-table -clear">
 						<tbody>
-						<?php foreach( $group as $rule_id => $rule ): 
+						<?php foreach ($group as $rule_id => $rule): 
 							
 							// valid rule
-							$rule = wp_parse_args( $rule, array(
+							$rule = wp_parse_args($rule, array(
 								'field'		=>	'',
 								'operator'	=>	'==',
 								'value'		=>	'',
@@ -89,7 +89,7 @@ 
 									<?php 
 									
 									$choices = array();
-									$choices[ $rule['field'] ] = $rule['field'];
+									$choices[$rule['field']] = $rule['field'];
 									
 									// create field
 									acf_render_field(array(
@@ -108,8 +108,8 @@ 
 									<?php 	
 									
 									$choices = array(
-										'=='	=>	__("is equal to",'acf'),
-										'!='	=>	__("is not equal to",'acf'),
+										'=='	=>	__("is equal to", 'acf'),
+										'!='	=>	__("is not equal to", 'acf'),
 									);
 									
 									
@@ -130,7 +130,7 @@ 
 									<?php 
 									
 									$choices = array();
-									$choices[ $rule['value'] ] = $rule['value'];
+									$choices[$rule['value']] = $rule['value'];
 									
 									// create field
 									acf_render_field(array(
@@ -146,7 +146,7 @@ 
 									?>
 								</td>
 								<td class="add">
-									<a href="#" class="acf-button add-conditional-rule"><?php _e("and",'acf'); ?></a>
+									<a href="#" class="acf-button add-conditional-rule"><?php _e("and", 'acf'); ?></a>
 								</td>
 								<td class="remove">
 									<a href="#" class="acf-icon -minus remove-conditional-rule"></a>
@@ -159,9 +159,9 @@ 
 				</div>
 			<?php endforeach; ?>
 			
-			<h4><?php _e("or",'acf'); ?></h4>
+			<h4><?php _e("or", 'acf'); ?></h4>
 			
-			<a href="#" class="acf-button add-conditional-group"><?php _e("Add rule group",'acf'); ?></a>
+			<a href="#" class="acf-button add-conditional-group"><?php _e("Add rule group", 'acf'); ?></a>
 			
 		</div>
 		

includes/acf/admin/views/field-group-field.php

Spacing +27 added lines, -27 removed lines

@@ -5,7 +5,7 @@ 
 
 
 // extract args
-extract( $args );
+extract($args);
 
 
 // add prefix
@@ -33,12 +33,12 @@ 
 $atts['class'] = str_replace('_', '-', $atts['class']);
 
 ?>
-<div <?php echo acf_esc_attr( $atts ); ?>>
+<div <?php echo acf_esc_attr($atts); ?>>
 	
 	<div class="meta">
-		<?php foreach( $meta as $k => $v ):
+		<?php foreach ($meta as $k => $v):
 			
-			acf_hidden_input(array( 'class' => "input-{$k}", 'name' => "{$field['prefix']}[{$k}]", 'value' => $v ));
+			acf_hidden_input(array('class' => "input-{$k}", 'name' => "{$field['prefix']}[{$k}]", 'value' => $v));
 				
 		endforeach; ?>
 	</div>
@@ -51,19 +51,19 @@ 
 			</li>
 			<li class="li-field-label">
 				<strong>
-					<a class="edit-field" title="<?php _e("Edit field",'acf'); ?>" href="#"><?php echo $field['label']; ?></a>
-					<?php if( $field['required'] ): ?><span class="acf-required">*</span><?php endif; ?>
+					<a class="edit-field" title="<?php _e("Edit field", 'acf'); ?>" href="#"><?php echo $field['label']; ?></a>
+					<?php if ($field['required']): ?><span class="acf-required">*</span><?php endif; ?>
 				</strong>
 				<div class="row-options">
-					<a class="edit-field" title="<?php _e("Edit field",'acf'); ?>" href="#"><?php _e("Edit",'acf'); ?></a>
-					<a class="duplicate-field" title="<?php _e("Duplicate field",'acf'); ?>" href="#"><?php _e("Duplicate",'acf'); ?></a>
-					<a class="move-field" title="<?php _e("Move field to another group",'acf'); ?>" href="#"><?php _e("Move",'acf'); ?></a>
-					<a class="delete-field" title="<?php _e("Delete field",'acf'); ?>" href="#"><?php _e("Delete",'acf'); ?></a>
+					<a class="edit-field" title="<?php _e("Edit field", 'acf'); ?>" href="#"><?php _e("Edit", 'acf'); ?></a>
+					<a class="duplicate-field" title="<?php _e("Duplicate field", 'acf'); ?>" href="#"><?php _e("Duplicate", 'acf'); ?></a>
+					<a class="move-field" title="<?php _e("Move field to another group", 'acf'); ?>" href="#"><?php _e("Move", 'acf'); ?></a>
+					<a class="delete-field" title="<?php _e("Delete field", 'acf'); ?>" href="#"><?php _e("Delete", 'acf'); ?></a>
 				</div>
 			</li>
 			<li class="li-field-name"><?php echo $field['name']; ?></li>
 			<li class="li-field-type">
-				<?php if( acf_field_type_exists($field['type']) ): ?>
+				<?php if (acf_field_type_exists($field['type'])): ?>
 					<?php echo acf_get_field_type_label($field['type']); ?>
 				<?php else: ?>
 					<b><?php _e('Error', 'acf'); ?></b> <?php _e('Field type does not exist', 'acf'); ?>
@@ -79,8 +79,8 @@ 
 		
 				// label
 				acf_render_field_wrap(array(
-					'label'			=> __('Field Label','acf'),
-					'instructions'	=> __('This is the name which will appear on the EDIT page','acf'),
+					'label'			=> __('Field Label', 'acf'),
+					'instructions'	=> __('This is the name which will appear on the EDIT page', 'acf'),
 					'required'		=> 1,
 					'type'			=> 'text',
 					'name'			=> 'label',
@@ -92,8 +92,8 @@ 
 				
 				// name
 				acf_render_field_wrap(array(
-					'label'			=> __('Field Name','acf'),
-					'instructions'	=> __('Single word, no spaces. Underscores and dashes allowed','acf'),
+					'label'			=> __('Field Name', 'acf'),
+					'instructions'	=> __('Single word, no spaces. Underscores and dashes allowed', 'acf'),
 					'required'		=> 1,
 					'type'			=> 'text',
 					'name'			=> 'name',
@@ -105,7 +105,7 @@ 
 				
 				// type
 				acf_render_field_wrap(array(
-					'label'			=> __('Field Type','acf'),
+					'label'			=> __('Field Type', 'acf'),
 					'instructions'	=> '',
 					'required'		=> 1,
 					'type'			=> 'select',
@@ -119,8 +119,8 @@ 
 				
 				// instructions
 				acf_render_field_wrap(array(
-					'label'			=> __('Instructions','acf'),
-					'instructions'	=> __('Instructions for authors. Shown when submitting data','acf'),
+					'label'			=> __('Instructions', 'acf'),
+					'instructions'	=> __('Instructions for authors. Shown when submitting data', 'acf'),
 					'type'			=> 'textarea',
 					'name'			=> 'instructions',
 					'prefix'		=> $field['prefix'],
@@ -131,15 +131,15 @@ 
 				
 				// required
 				acf_render_field_wrap(array(
-					'label'			=> __('Required?','acf'),
+					'label'			=> __('Required?', 'acf'),
 					'instructions'	=> '',
 					'type'			=> 'radio',
 					'name'			=> 'required',
 					'prefix'		=> $field['prefix'],
 					'value'			=> $field['required'],
 					'choices'		=> array(
-						1				=> __("Yes",'acf'),
-						0				=> __("No",'acf'),
+						1				=> __("Yes", 'acf'),
+						0				=> __("No", 'acf'),
 					),
 					'layout'		=> 'horizontal',
 					'class'			=> 'field-required'
@@ -155,16 +155,16 @@ 
 				
 				
 				// conditional logic
-				acf_get_view('field-group-field-conditional-logic', array( 'field' => $field ));
+				acf_get_view('field-group-field-conditional-logic', array('field' => $field));
 				
 				
 				// wrapper
 				acf_render_field_wrap(array(
-					'label'			=> __('Wrapper Attributes','acf'),
+					'label'			=> __('Wrapper Attributes', 'acf'),
 					'instructions'	=> '',
 					'type'			=> 'text',
 					'name'			=> 'width',
-					'prefix'		=> $field['prefix'] . '[wrapper]',
+					'prefix'		=> $field['prefix'].'[wrapper]',
 					'value'			=> $field['wrapper']['width'],
 					'prepend'		=> __('width', 'acf'),
 					'append'		=> '%',
@@ -178,7 +178,7 @@ 
 					'instructions'	=> '',
 					'type'			=> 'text',
 					'name'			=> 'class',
-					'prefix'		=> $field['prefix'] . '[wrapper]',
+					'prefix'		=> $field['prefix'].'[wrapper]',
 					'value'			=> $field['wrapper']['class'],
 					'prepend'		=> __('class', 'acf'),
 					'wrapper'		=> array(
@@ -191,7 +191,7 @@ 
 					'instructions'	=> '',
 					'type'			=> 'text',
 					'name'			=> 'id',
-					'prefix'		=> $field['prefix'] . '[wrapper]',
+					'prefix'		=> $field['prefix'].'[wrapper]',
 					'value'			=> $field['wrapper']['id'],
 					'prepend'		=> __('id', 'acf'),
 					'wrapper'		=> array(
@@ -205,7 +205,7 @@ 
 					<td class="acf-input">
 						<ul class="acf-hl">
 							<li>
-								<a class="edit-field acf-button grey" title="<?php _e("Close Field",'acf'); ?>" href="#"><?php _e("Close Field",'acf'); ?></a>
+								<a class="edit-field acf-button grey" title="<?php _e("Close Field", 'acf'); ?>" href="#"><?php _e("Close Field", 'acf'); ?></a>
 							</li>
 						</ul>
 					</td>

Braces +5 added lines, -2 removed lines

@@ -65,8 +65,11 @@
 			<li class="li-field-type">
 				<?php if( acf_field_type_exists($field['type']) ): ?>
 					<?php echo acf_get_field_type_label($field['type']); ?>
-				<?php else: ?>
-					<b><?php _e('Error', 'acf'); ?></b> <?php _e('Field type does not exist', 'acf'); ?>
+				<?php else {
+	: ?>
+					<b><?php _e('Error', 'acf');
+}
+?></b> <?php _e('Field type does not exist', 'acf'); ?>
 				<?php endif; ?>
 			</li>	
 		</ul>