rousnay / lighthouse

includes/acf/forms/user.php

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 	*  @return	n/a
 	*/
 	
+	/**
+	 * @param string $user_form
+	 */
 	function render( $user_id, $user_form, $el = 'tr' ) {
 		
 		// vars

Indentation +2 added lines, -2 removed lines

@@ -382,8 +382,8 @@
 		}
 		
 	    
-	    // save data
-	    if( acf_validate_save_post(true) ) {
+		// save data
+		if( acf_validate_save_post(true) ) {
 	    	
 			acf_save_post( "user_{$user_id}" );
 		

Spacing +31 added lines, -31 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_user') ) :
+if ( ! class_exists('acf_form_user')) :
 
 class acf_form_user {
 	
@@ -33,20 +33,20 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',			array($this, 'admin_enqueue_scripts'));
-		add_action('login_form_register', 			array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
+		add_action('login_form_register', array($this, 'admin_enqueue_scripts'));
 		
 		// render
-		add_action('show_user_profile', 			array($this, 'edit_user'));
-		add_action('edit_user_profile',				array($this, 'edit_user'));
-		add_action('user_new_form',					array($this, 'user_new_form'));
-		add_action('register_form',					array($this, 'register_user'));
+		add_action('show_user_profile', array($this, 'edit_user'));
+		add_action('edit_user_profile', array($this, 'edit_user'));
+		add_action('user_new_form', array($this, 'user_new_form'));
+		add_action('register_form', array($this, 'register_user'));
 		
 		// save
 		//add_action('edit_user_profile_update',	array($this, 'save_user'));
 		//add_action('personal_options_update',		array($this, 'save_user'));
-		add_action('user_register',					array($this, 'save_user'));
-		add_action('profile_update',				array($this, 'save_user'));
+		add_action('user_register', array($this, 'save_user'));
+		add_action('profile_update', array($this, 'save_user'));
 		
 	}
 	
@@ -71,7 +71,7 @@ 
 		
 		
 		// validate page
-		if( in_array( $pagenow, array('profile.php', 'user-edit.php', 'user-new.php', 'wp-login.php') ) ) {
+		if (in_array($pagenow, array('profile.php', 'user-edit.php', 'user-new.php', 'wp-login.php'))) {
 			
 			return true;
 		
@@ -100,7 +100,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( ! $this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 		
 			return;
 			
@@ -137,7 +137,7 @@ 
 		
 		
 		// render
-		$this->render( 0, 'register', 'div' );
+		$this->render(0, 'register', 'div');
 		
 	}
 	
@@ -155,14 +155,14 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_user( $user ) {
+	function edit_user($user) {
 		
 		// update vars
 		$this->form = '#your-profile';
 		
 		
 		// render
-		$this->render( $user->ID, 'edit', 'tr' );
+		$this->render($user->ID, 'edit', 'tr');
 		
 	}
 	
@@ -187,7 +187,7 @@ 
 		
 		
 		// render
-		$this->render( 0, 'add', 'tr' );
+		$this->render(0, 'add', 'tr');
 		
 	}
 	
@@ -207,7 +207,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function render( $user_id, $user_form, $el = 'tr' ) {
+	function render($user_id, $user_form, $el = 'tr') {
 		
 		// vars
 		$post_id = "user_{$user_id}";
@@ -215,7 +215,7 @@ 
 		
 		
 		// show title
-		if( $user_form == 'register' ) {
+		if ($user_form == 'register') {
 			
 			$show_title = false;
 		
@@ -228,7 +228,7 @@ 
 			'user_form'	=> $user_form
 		);
 		
-		if( $user_id ) {
+		if ($user_id) {
 		
 			$args['user_id'] = $user_id;
 			
@@ -236,34 +236,34 @@ 
 		
 		
 		// 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'		=> 'user' 
 			));
 			
-			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( $show_title && $field_group['style'] == 'default' ): ?>
+				<?php if ($show_title && $field_group['style'] == 'default'): ?>
 					<h3><?php echo $field_group['title']; ?></h3>
 				<?php endif; ?>
 				
-				<?php if( $el == 'tr' ): ?>
+				<?php if ($el == 'tr'): ?>
 					<table class="form-table">
 						<tbody>
 				<?php endif; ?>
 				
-					<?php acf_render_fields( $post_id, $fields, $el, 'field' ); ?>
+					<?php acf_render_fields($post_id, $fields, $el, 'field'); ?>
 				
-				<?php if( $el == 'tr' ): ?>
+				<?php if ($el == 'tr'): ?>
 						</tbody>
 					</table>
 				<?php endif; ?>
@@ -294,7 +294,7 @@ 
 ?>
 <style type="text/css">
 
-<?php if( is_admin() ): ?>
+<?php if (is_admin()): ?>
 
 /* override for user css */
 .acf-field input[type="text"],
@@ -372,10 +372,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_user( $user_id ) {
+	function save_user($user_id) {
 		
 		// verify and remove nonce
-		if( ! acf_verify_nonce('user') ) {
+		if ( ! acf_verify_nonce('user')) {
 			
 			return $user_id;
 		
@@ -383,9 +383,9 @@ 
 		
 	    
 	    // save data
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    	
-			acf_save_post( "user_{$user_id}" );
+			acf_save_post("user_{$user_id}");
 		
 		}
 			

Braces +5 added lines, -2 removed lines

@@ -324,13 +324,16 @@
     width: 100%;
 }
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 #registerform p.submit {
 	text-align: right;
 }
 
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 </style>
 <script type="text/javascript">

includes/acf/pro/api/api-pro.php

Doc Comments +3 added lines

@@ -72,6 +72,9 @@
 *  @return	$post_id (int)
 */
 
+/**
+ * @return string
+ */
 function acf_pro_get_remote_response( $action = '', $post = array() ) {
 	
 	// vars

Indentation +15 added lines, -15 removed lines

@@ -85,15 +85,15 @@ 
 	
 	
 	// return body
-    if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
+	if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
     	
-        return $request['body'];
+		return $request['body'];
     
-    }
+	}
     
     
-    // return
-    return 0;
+	// return
+	return 0;
     
 }
 
@@ -126,12 +126,12 @@ 
 	}
 	
     
-    // return false if the external version is '<=' the current version
+	// return false if the external version is '<=' the current version
 	if( version_compare($info['version'], $version, '<=') ) {
 		
-    	return false;
+		return false;
     
-    }
+	}
     
 	
 	// return
@@ -187,20 +187,20 @@ 
 	$timeout = 12 * HOUR_IN_SECONDS;
 	
 	
-    // decode
-    if( !empty($info) ) {
+	// decode
+	if( !empty($info) ) {
     	
 		$info = json_decode($info, true);
 		
 		// fake info version
-        //$info['version'] = '6.0.0';
+		//$info['version'] = '6.0.0';
         
-    } else {
+	} else {
 	    
-	    $info = 0; // allow transient to be returned, but empty to validate
-	    $timeout = 2 * HOUR_IN_SECONDS;
+		$info = 0; // allow transient to be returned, but empty to validate
+		$timeout = 2 * HOUR_IN_SECONDS;
 	    
-    }
+	}
         
         
 	// update transient

Spacing +24 added lines, -24 removed lines

@@ -14,15 +14,15 @@ 
 *  @return	n/a
 */
 
-function acf_pro_get_view( $view_name = '', $args = array() ) {
+function acf_pro_get_view($view_name = '', $args = array()) {
 	
 	// vars
 	$path = acf_get_path("pro/admin/views/{$view_name}.php");
 	
 	
-	if( file_exists($path) ) {
+	if (file_exists($path)) {
 		
-		include( $path );
+		include($path);
 		
 	}
 	
@@ -42,7 +42,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_pro_get_remote_url( $action = '', $args = array() ) {
+function acf_pro_get_remote_url($action = '', $args = array()) {
 	
 	// defaults
 	$args['a'] = $action;
@@ -50,7 +50,7 @@ 
 	
 	
 	// vars
-	$url = "http://connect.advancedcustomfields.com/index.php?" . build_query($args);
+	$url = "http://connect.advancedcustomfields.com/index.php?".build_query($args);
 	
 	
 	// return
@@ -72,20 +72,20 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_pro_get_remote_response( $action = '', $post = array() ) {
+function acf_pro_get_remote_response($action = '', $post = array()) {
 	
 	// vars
-	$url = acf_pro_get_remote_url( $action );
+	$url = acf_pro_get_remote_url($action);
 	
 	
 	// connect
-	$request = wp_remote_post( $url, array(
+	$request = wp_remote_post($url, array(
 		'body' => $post
 	));
 	
 	
 	// return body
-    if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
+    if ( ! is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
     	
         return $request['body'];
     
@@ -119,7 +119,7 @@ 
 	 
 	
 	// return false if no info
-	if( empty($info['version']) ) {
+	if (empty($info['version'])) {
 		
 		return false;
 		
@@ -127,7 +127,7 @@ 
 	
     
     // return false if the external version is '<=' the current version
-	if( version_compare($info['version'], $version, '<=') ) {
+	if (version_compare($info['version'], $version, '<=')) {
 		
     	return false;
     
@@ -156,12 +156,12 @@ 
 function acf_pro_get_remote_info() {
 	
 	// clear transient if force check is enabled
-	if( !empty($_GET['force-check']) ) {
+	if ( ! empty($_GET['force-check'])) {
 		
 		// only allow transient to be deleted once per page load
-		if( empty($_GET['acf-ignore-force-check']) ) {
+		if (empty($_GET['acf-ignore-force-check'])) {
 			
-			delete_transient( 'acf_pro_get_remote_info' );
+			delete_transient('acf_pro_get_remote_info');
 			
 		}
 		
@@ -173,9 +173,9 @@ 
 	
 	
 	// get transient
-	$transient = get_transient( 'acf_pro_get_remote_info' );
+	$transient = get_transient('acf_pro_get_remote_info');
 
-	if( $transient !== false ) {
+	if ($transient !== false) {
 	
 		return $transient;
 	
@@ -188,7 +188,7 @@ 
 	
 	
     // decode
-    if( !empty($info) ) {
+    if ( ! empty($info)) {
     	
 		$info = json_decode($info, true);
 		
@@ -204,7 +204,7 @@ 
         
         
 	// update transient
-	set_transient('acf_pro_get_remote_info', $info, $timeout );
+	set_transient('acf_pro_get_remote_info', $info, $timeout);
 	
 	
 	// return
@@ -215,10 +215,10 @@ 
 function acf_pro_is_license_active() {
 	
 	// vars
-	$data = acf_pro_get_license( true );
+	$data = acf_pro_get_license(true);
 	$url = home_url();
 	
-	if( !empty($data['url']) && !empty($data['key']) && $data['url'] == $url ) {
+	if ( ! empty($data['url']) && ! empty($data['key']) && $data['url'] == $url) {
 		
 		return true;
 		
@@ -229,7 +229,7 @@ 
 	
 }
 
-function acf_pro_get_license( $all = false ) {
+function acf_pro_get_license($all = false) {
 	
 	// get option
 	$data = get_option('acf_pro_license');
@@ -240,12 +240,12 @@ 
 	
 	
 	// attempt deserialize
-	if( is_serialized( $data ) )
+	if (is_serialized($data))
 	{
 		$data = maybe_unserialize($data);
 		
 		// $all
-		if( !$all )
+		if ( ! $all)
 		{
 			$data = $data['key'];
 		}
@@ -260,7 +260,7 @@ 
 
 
 
-function acf_pro_update_license( $license ) {
+function acf_pro_update_license($license) {
 	
 	$save = array(
 		'key'	=> $license,

inc/template-tags.php

Spacing +34 added lines, -34 removed lines

@@ -7,69 +7,69 @@ 
  * @package Lighthouse
  */
 
-if ( ! function_exists( 'lighthouse_posted_on' ) ) :
+if ( ! function_exists('lighthouse_posted_on')) :
 /**
  * Prints HTML with meta information for the current post-date/time and author.
  */
 function lighthouse_posted_on() {
 	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+	if (get_the_time('U') !== get_the_modified_time('U')) {
 		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
 	}
 
-	$time_string = sprintf( $time_string,
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_attr( get_the_modified_date( 'c' ) ),
-		esc_html( get_the_modified_date() )
+	$time_string = sprintf($time_string,
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date()),
+		esc_attr(get_the_modified_date('c')),
+		esc_html(get_the_modified_date())
 	);
 
 	$posted_on = sprintf(
-		esc_html_x( 'Posted on %s', 'post date', 'lighthouse' ),
-		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
+		esc_html_x('Posted on %s', 'post date', 'lighthouse'),
+		'<a href="'.esc_url(get_permalink()).'" rel="bookmark">'.$time_string.'</a>'
 	);
 
 	$byline = sprintf(
-		esc_html_x( 'by %s', 'post author', 'lighthouse' ),
-		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span>'
+		esc_html_x('by %s', 'post author', 'lighthouse'),
+		'<span class="author vcard"><a class="url fn n" href="'.esc_url(get_author_posts_url(get_the_author_meta('ID'))).'">'.esc_html(get_the_author()).'</a></span>'
 	);
 
-	echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
+	echo '<span class="posted-on">'.$posted_on.'</span><span class="byline"> '.$byline.'</span>'; // WPCS: XSS OK.
 
 }
 endif;
 
-if ( ! function_exists( 'lighthouse_entry_footer' ) ) :
+if ( ! function_exists('lighthouse_entry_footer')) :
 /**
  * Prints HTML with meta information for the categories, tags and comments.
  */
 function lighthouse_entry_footer() {
 	// Hide category and tag text for pages.
-	if ( 'post' === get_post_type() ) {
+	if ('post' === get_post_type()) {
 		/* translators: used between list items, there is a space after the comma */
-		$categories_list = get_the_category_list( esc_html__( ', ', 'lighthouse' ) );
-		if ( $categories_list && lighthouse_categorized_blog() ) {
-			printf( '<span class="cat-links">' . esc_html__( 'Posted in %1$s', 'lighthouse' ) . '</span>', $categories_list ); // WPCS: XSS OK.
+		$categories_list = get_the_category_list(esc_html__(', ', 'lighthouse'));
+		if ($categories_list && lighthouse_categorized_blog()) {
+			printf('<span class="cat-links">'.esc_html__('Posted in %1$s', 'lighthouse').'</span>', $categories_list); // WPCS: XSS OK.
 		}
 
 		/* translators: used between list items, there is a space after the comma */
-		$tags_list = get_the_tag_list( '', esc_html__( ', ', 'lighthouse' ) );
-		if ( $tags_list ) {
-			printf( '<span class="tags-links">' . esc_html__( 'Tagged %1$s', 'lighthouse' ) . '</span>', $tags_list ); // WPCS: XSS OK.
+		$tags_list = get_the_tag_list('', esc_html__(', ', 'lighthouse'));
+		if ($tags_list) {
+			printf('<span class="tags-links">'.esc_html__('Tagged %1$s', 'lighthouse').'</span>', $tags_list); // WPCS: XSS OK.
 		}
 	}
 
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+	if ( ! is_single() && ! post_password_required() && (comments_open() || get_comments_number())) {
 		echo '<span class="comments-link">';
-		comments_popup_link( esc_html__( 'Leave a comment', 'lighthouse' ), esc_html__( '1 Comment', 'lighthouse' ), esc_html__( '% Comments', 'lighthouse' ) );
+		comments_popup_link(esc_html__('Leave a comment', 'lighthouse'), esc_html__('1 Comment', 'lighthouse'), esc_html__('% Comments', 'lighthouse'));
 		echo '</span>';
 	}
 
 	edit_post_link(
 		sprintf(
 			/* translators: %s: Name of current post */
-			esc_html__( 'Edit %s', 'lighthouse' ),
-			the_title( '<span class="screen-reader-text">"', '"</span>', false )
+			esc_html__('Edit %s', 'lighthouse'),
+			the_title('<span class="screen-reader-text">"', '"</span>', false)
 		),
 		'<span class="edit-link">',
 		'</span>'
@@ -83,22 +83,22 @@ 
  * @return bool
  */
 function lighthouse_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'lighthouse_categories' ) ) ) {
+	if (false === ($all_the_cool_cats = get_transient('lighthouse_categories'))) {
 		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
+		$all_the_cool_cats = get_categories(array(
 			'fields'     => 'ids',
 			'hide_empty' => 1,
 			// We only need to know if there is more than one category.
 			'number'     => 2,
-		) );
+		));
 
 		// Count the number of categories that are attached to the posts.
-		$all_the_cool_cats = count( $all_the_cool_cats );
+		$all_the_cool_cats = count($all_the_cool_cats);
 
-		set_transient( 'lighthouse_categories', $all_the_cool_cats );
+		set_transient('lighthouse_categories', $all_the_cool_cats);
 	}
 
-	if ( $all_the_cool_cats > 1 ) {
+	if ($all_the_cool_cats > 1) {
 		// This blog has more than 1 category so lighthouse_categorized_blog should return true.
 		return true;
 	} else {
@@ -111,11 +111,11 @@ 
  * Flush out the transients used in lighthouse_categorized_blog.
  */
 function lighthouse_category_transient_flusher() {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 	// Like, beat it. Dig?
-	delete_transient( 'lighthouse_categories' );
+	delete_transient('lighthouse_categories');
 }
-add_action( 'edit_category', 'lighthouse_category_transient_flusher' );
-add_action( 'save_post',     'lighthouse_category_transient_flusher' );
\ No newline at end of file
+add_action('edit_category', 'lighthouse_category_transient_flusher');
+add_action('save_post', 'lighthouse_category_transient_flusher');
\ No newline at end of file

includes/acf-settings.php

Indentation +18 added lines, -18 removed lines

@@ -8,11 +8,11 @@ 
  

 function my_acf_settings_path( $path ) {

  

-    // update path

-    $path = get_stylesheet_directory() . '/includes/acf/';

+	// update path

+	$path = get_stylesheet_directory() . '/includes/acf/';

     

-    // return

-    return $path;

+	// return

+	return $path;

 }

 

 // Customize ACF dir

@@ -20,11 +20,11 @@ 
  

 function my_acf_settings_dir( $dir ) {

  

-    // update path

-    $dir = get_stylesheet_directory_uri() . '/includes/acf/';

+	// update path

+	$dir = get_stylesheet_directory_uri() . '/includes/acf/';

     

-    // return

-    return $dir;

+	// return

+	return $dir;

 }

 

 // Save ACF field as JSON

@@ -32,11 +32,11 @@ 
  

 function my_acf_json_save_point( $path ) {

     

-    // update path

-    $path = get_stylesheet_directory() . '/includes/acf-json';

+	// update path

+	$path = get_stylesheet_directory() . '/includes/acf-json';

     

-    // return

-    return $path; 

+	// return

+	return $path; 

 }

 

 // Load ACF field from JSON

@@ -44,14 +44,14 @@ 
 

 function my_acf_json_load_point( $paths ) {

     

-    // remove original path (optional)

-    unset($paths[0]);

+	// remove original path (optional)

+	unset($paths[0]);

     

-    // append path

-    $paths[] = get_stylesheet_directory() . '/includes/acf-json';

+	// append path

+	$paths[] = get_stylesheet_directory() . '/includes/acf-json';

     

-    // return

-    return $paths;

+	// return

+	return $paths;

 }

 

 

Spacing +9 added lines, -9 removed lines

@@ -6,10 +6,10 @@ 
 // Customize ACF path

 add_filter('acf/settings/path', 'my_acf_settings_path');

  

-function my_acf_settings_path( $path ) {

+function my_acf_settings_path($path) {

  

     // update path

-    $path = get_stylesheet_directory() . '/includes/acf/';

+    $path = get_stylesheet_directory().'/includes/acf/';

     

     // return

     return $path;

@@ -18,10 +18,10 @@ 
 // Customize ACF dir

 add_filter('acf/settings/dir', 'my_acf_settings_dir');

  

-function my_acf_settings_dir( $dir ) {

+function my_acf_settings_dir($dir) {

  

     // update path

-    $dir = get_stylesheet_directory_uri() . '/includes/acf/';

+    $dir = get_stylesheet_directory_uri().'/includes/acf/';

     

     // return

     return $dir;

@@ -30,10 +30,10 @@ 
 // Save ACF field as JSON

 add_filter('acf/settings/save_json', 'my_acf_json_save_point');

  

-function my_acf_json_save_point( $path ) {

+function my_acf_json_save_point($path) {

     

     // update path

-    $path = get_stylesheet_directory() . '/includes/acf-json';

+    $path = get_stylesheet_directory().'/includes/acf-json';

     

     // return

     return $path; 

@@ -42,13 +42,13 @@ 
 // Load ACF field from JSON

 add_filter('acf/settings/load_json', 'my_acf_json_load_point');

 

-function my_acf_json_load_point( $paths ) {

+function my_acf_json_load_point($paths) {

     

     // remove original path (optional)

     unset($paths[0]);

     

     // append path

-    $paths[] = get_stylesheet_directory() . '/includes/acf-json';

+    $paths[] = get_stylesheet_directory().'/includes/acf-json';

     

     // return

     return $paths;

@@ -58,7 +58,7 @@ 
 /*****

  Options Page

 ***************/

-if( function_exists('acf_add_options_page') ) {

+if (function_exists('acf_add_options_page')) {

 

 	acf_add_options_page(array(

 		'page_title' 	=> 'Lighthouse General Settings',

includes/acf/acf.php

Indentation +26 added lines, -26 removed lines

@@ -263,16 +263,16 @@ 
 		// register post type 'acf-field-group'
 		register_post_type('acf-field-group', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Field Groups', 'acf' ),
+				'name'					=> __( 'Field Groups', 'acf' ),
 				'singular_name'			=> __( 'Field Group', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
-			    'new_item'				=> __( 'New Field Group' , 'acf' ),
-			    'view_item'				=> __( 'View Field Group', 'acf' ),
-			    'search_items'			=> __( 'Search Field Groups', 'acf' ),
-			    'not_found'				=> __( 'No Field Groups found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
+				'add_new'				=> __( 'Add New' , 'acf' ),
+				'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
+				'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
+				'new_item'				=> __( 'New Field Group' , 'acf' ),
+				'view_item'				=> __( 'View Field Group', 'acf' ),
+				'search_items'			=> __( 'Search Field Groups', 'acf' ),
+				'not_found'				=> __( 'No Field Groups found', 'acf' ),
+				'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
 			),
 			'public'			=> false,
 			'show_ui'			=> true,
@@ -295,16 +295,16 @@ 
 		// register post type 'acf-field'
 		register_post_type('acf-field', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Fields', 'acf' ),
+				'name'					=> __( 'Fields', 'acf' ),
 				'singular_name'			=> __( 'Field', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field' , 'acf' ),
-			    'new_item'				=> __( 'New Field' , 'acf' ),
-			    'view_item'				=> __( 'View Field', 'acf' ),
-			    'search_items'			=> __( 'Search Fields', 'acf' ),
-			    'not_found'				=> __( 'No Fields found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
+				'add_new'				=> __( 'Add New' , 'acf' ),
+				'add_new_item'			=> __( 'Add New Field' , 'acf' ),
+				'edit_item'				=> __( 'Edit Field' , 'acf' ),
+				'new_item'				=> __( 'New Field' , 'acf' ),
+				'view_item'				=> __( 'View Field', 'acf' ),
+				'search_items'			=> __( 'Search Fields', 'acf' ),
+				'not_found'				=> __( 'No Fields found', 'acf' ),
+				'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
 			),
 			'public'			=> false,
 			'show_ui'			=> false,
@@ -413,27 +413,27 @@ 
 		
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key );
 			
-	    }
+		}
 	    
 	    
-	    // acf_field_name
-	    if( $field_name = $wp_query->get('acf_field_name') ) {
+		// acf_field_name
+		if( $field_name = $wp_query->get('acf_field_name') ) {
 	    
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name );
 			
-	    }
+		}
 	    
 	    
-	    // acf_group_key
+		// acf_group_key
 		if( $group_key = $wp_query->get('acf_group_key') ) {
 		
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key );
 			
-	    }
+		}
 	    
 	    
-	    // return
-	    return $where;
+		// return
+		return $where;
 	    
 	}
 	

Spacing +52 added lines, -52 removed lines

@@ -11,9 +11,9 @@ 
 Domain Path: /lang
 */
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if( ! class_exists('acf') ) :
+if ( ! class_exists('acf')) :
 
 class acf {
 	
@@ -64,9 +64,9 @@ 
 			'version'			=> '5.3.3.1',
 						
 			// urls
-			'basename'			=> plugin_basename( __FILE__ ),
-			'path'				=> plugin_dir_path( __FILE__ ),
-			'dir'				=> plugin_dir_url( __FILE__ ),
+			'basename'			=> plugin_basename(__FILE__),
+			'path'				=> plugin_dir_path(__FILE__),
+			'dir'				=> plugin_dir_url(__FILE__),
 			
 			// options
 			'show_admin'		=> true,
@@ -122,7 +122,7 @@ 
 		
 		
 		// admin
-		if( is_admin() ) {
+		if (is_admin()) {
 			
 			acf_include('admin/admin.php');
 			acf_include('admin/field-group.php');
@@ -139,14 +139,14 @@ 
 		
 		
 		// actions
-		add_action('init',	array($this, 'init'), 5);
-		add_action('init',	array($this, 'register_post_types'), 5);
-		add_action('init',	array($this, 'register_post_status'), 5);
-		add_action('init',	array($this, 'register_assets'), 5);
+		add_action('init', array($this, 'init'), 5);
+		add_action('init', array($this, 'register_post_types'), 5);
+		add_action('init', array($this, 'register_post_status'), 5);
+		add_action('init', array($this, 'register_assets'), 5);
 		
 		
 		// filters
-		add_filter('posts_where',		array($this, 'posts_where'), 10, 2 );
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
 		//add_filter('posts_request',	array($this, 'posts_request'), 10, 1 );
 		
 	}
@@ -168,11 +168,11 @@ 
 	function init() {
 		
 		// bail early if a plugin called get_field early
-		if( !did_action('plugins_loaded') ) return;
+		if ( ! did_action('plugins_loaded')) return;
 		
 		
 		// bail early if already init
-		if( acf_get_setting('init') ) return;
+		if (acf_get_setting('init')) return;
 		
 		
 		// only run once
@@ -180,20 +180,20 @@ 
 		
 		
 		// vars
-		$major = intval( acf_get_setting('version') );
+		$major = intval(acf_get_setting('version'));
 		
 		
 		// redeclare dir
 		// - allow another plugin to modify dir (maybe force SSL)
-		acf_update_setting('dir', plugin_dir_url( __FILE__ ));
+		acf_update_setting('dir', plugin_dir_url(__FILE__));
 		
 		
 		// set text domain
-		load_textdomain( 'acf', acf_get_path( 'lang/acf-' . get_locale() . '.mo' ) );
+		load_textdomain('acf', acf_get_path('lang/acf-'.get_locale().'.mo'));
 		
 		
 		// include wpml support
-		if( defined('ICL_SITEPRESS_VERSION') ) {
+		if (defined('ICL_SITEPRESS_VERSION')) {
 		
 			acf_include('core/wpml.php');
 			
@@ -263,16 +263,16 @@ 
 		// register post type 'acf-field-group'
 		register_post_type('acf-field-group', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Field Groups', 'acf' ),
-				'singular_name'			=> __( 'Field Group', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
-			    'new_item'				=> __( 'New Field Group' , 'acf' ),
-			    'view_item'				=> __( 'View Field Group', 'acf' ),
-			    'search_items'			=> __( 'Search Field Groups', 'acf' ),
-			    'not_found'				=> __( 'No Field Groups found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
+			    'name'					=> __('Field Groups', 'acf'),
+				'singular_name'			=> __('Field Group', 'acf'),
+			    'add_new'				=> __('Add New', 'acf'),
+			    'add_new_item'			=> __('Add New Field Group', 'acf'),
+			    'edit_item'				=> __('Edit Field Group', 'acf'),
+			    'new_item'				=> __('New Field Group', 'acf'),
+			    'view_item'				=> __('View Field Group', 'acf'),
+			    'search_items'			=> __('Search Field Groups', 'acf'),
+			    'not_found'				=> __('No Field Groups found', 'acf'),
+			    'not_found_in_trash'	=> __('No Field Groups found in Trash', 'acf'), 
 			),
 			'public'			=> false,
 			'show_ui'			=> true,
@@ -295,16 +295,16 @@ 
 		// register post type 'acf-field'
 		register_post_type('acf-field', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Fields', 'acf' ),
-				'singular_name'			=> __( 'Field', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field' , 'acf' ),
-			    'new_item'				=> __( 'New Field' , 'acf' ),
-			    'view_item'				=> __( 'View Field', 'acf' ),
-			    'search_items'			=> __( 'Search Fields', 'acf' ),
-			    'not_found'				=> __( 'No Fields found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
+			    'name'					=> __('Fields', 'acf'),
+				'singular_name'			=> __('Field', 'acf'),
+			    'add_new'				=> __('Add New', 'acf'),
+			    'add_new_item'			=> __('Add New Field', 'acf'),
+			    'edit_item'				=> __('Edit Field', 'acf'),
+			    'new_item'				=> __('New Field', 'acf'),
+			    'view_item'				=> __('View Field', 'acf'),
+			    'search_items'			=> __('Search Fields', 'acf'),
+			    'not_found'				=> __('No Fields found', 'acf'),
+			    'not_found_in_trash'	=> __('No Fields found in Trash', 'acf'), 
 			),
 			'public'			=> false,
 			'show_ui'			=> false,
@@ -343,12 +343,12 @@ 
 		
 		// acf-disabled
 		register_post_status('acf-disabled', array(
-			'label'                     => __( 'Disabled', 'acf' ),
+			'label'                     => __('Disabled', 'acf'),
 			'public'                    => true,
 			'exclude_from_search'       => false,
 			'show_in_admin_all_list'    => true,
 			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf' ),
+			'label_count'               => _n_noop('Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf'),
 		));
 		
 	}
@@ -376,14 +376,14 @@ 
 		
 		
 		// scripts
-		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version );
-		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version );
+		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version);
+		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version);
 		
 		
 		// styles
-		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version );
-		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version );
-		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version );
+		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version);
+		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version);
+		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version);
 		
 	}
 	
@@ -402,32 +402,32 @@ 
 	*  @return	$where (string)
 	*/
 	
-	function posts_where( $where, $wp_query ) {
+	function posts_where($where, $wp_query) {
 		
 		// global
 		global $wpdb;
 		
 		
 		// acf_field_key
-		if( $field_key = $wp_query->get('acf_field_key') ) {
+		if ($field_key = $wp_query->get('acf_field_key')) {
 		
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key);
 			
 	    }
 	    
 	    
 	    // acf_field_name
-	    if( $field_name = $wp_query->get('acf_field_name') ) {
+	    if ($field_name = $wp_query->get('acf_field_name')) {
 	    
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name);
 			
 	    }
 	    
 	    
 	    // acf_group_key
-		if( $group_key = $wp_query->get('acf_group_key') ) {
+		if ($group_key = $wp_query->get('acf_group_key')) {
 		
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key);
 			
 	    }
 	    
@@ -468,7 +468,7 @@ 
 
 	global $acf;
 	
-	if( !isset($acf) ) {
+	if ( ! isset($acf)) {
 	
 		$acf = new acf();
 		

Braces +10 added lines, -3 removed lines

@@ -11,7 +11,10 @@ 
 Domain Path: /lang
 */
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 if( ! class_exists('acf') ) :
 
@@ -168,11 +171,15 @@ 
 	function init() {
 		
 		// bail early if a plugin called get_field early
-		if( !did_action('plugins_loaded') ) return;
+		if( !did_action('plugins_loaded') ) {
+			return;
+		}
 		
 		
 		// bail early if already init
-		if( acf_get_setting('init') ) return;
+		if( acf_get_setting('init') ) {
+			return;
+		}
 		
 		
 		// only run once

includes/acf/admin/admin.php

Spacing +12 added lines, -12 removed lines

@@ -18,9 +18,9 @@ 
 	function __construct() {
 	
 		// actions
-		add_action('admin_menu', 			array($this, 'admin_menu'));
-		add_action('admin_enqueue_scripts',	array($this, 'admin_enqueue_scripts'), 0);
-		add_action('admin_notices', 		array($this, 'admin_notices'));
+		add_action('admin_menu', array($this, 'admin_menu'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 0);
+		add_action('admin_notices', array($this, 'admin_notices'));
 		
 	}
 	
@@ -41,7 +41,7 @@ 
 	function admin_menu() {
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 			
@@ -54,12 +54,12 @@ 
 		
 		
 		// add parent
-		add_menu_page(__("Custom Fields",'acf'), __("Custom Fields",'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
+		add_menu_page(__("Custom Fields", 'acf'), __("Custom Fields", 'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
 		
 		
 		// add children
-		add_submenu_page($slug, __('Field Groups','acf'), __('Field Groups','acf'), $cap, $slug );
-		add_submenu_page($slug, __('Add New','acf'), __('Add New','acf'), $cap, 'post-new.php?post_type=acf-field-group' );
+		add_submenu_page($slug, __('Field Groups', 'acf'), __('Field Groups', 'acf'), $cap, $slug);
+		add_submenu_page($slug, __('Add New', 'acf'), __('Add New', 'acf'), $cap, 'post-new.php?post_type=acf-field-group');
 		
 	}
 	
@@ -79,7 +79,7 @@ 
 	
 	function admin_enqueue_scripts() {
 		
-		wp_enqueue_style( 'acf-global' );
+		wp_enqueue_style('acf-global');
 		
 	}
 	
@@ -104,19 +104,19 @@ 
 		
 		
 		// bail early if no notices
-		if( empty($admin_notices) ) {
+		if (empty($admin_notices)) {
 			
 			return;
 			
 		}
 		
 		
-		foreach( $admin_notices as $notice ) {
+		foreach ($admin_notices as $notice) {
 			
 			$open = '';
 			$close = '';
 				
-			if( $notice['wrap'] ) {
+			if ($notice['wrap']) {
 				
 				$open = "<{$notice['wrap']}>";
 				$close = "</{$notice['wrap']}>";
@@ -124,7 +124,7 @@ 
 			}
 				
 			?>
-			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open . $notice['text'] . $close; ?></div>
+			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open.$notice['text'].$close; ?></div>
 			<?php
 				
 		}

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 );
         }