rousnay / lighthouse

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>

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

Spacing +13 added lines, -13 removed lines

@@ -8,14 +8,14 @@ 
 
 
 // use fields if passed in
-extract( $args );
+extract($args);
 
 
 // add clone
 $fields[] = acf_get_valid_field(array(
 	'ID'		=> 'acfcloneindex',
 	'key'		=> 'acfcloneindex',
-	'label'		=> __('New Field','acf'),
+	'label'		=> __('New Field', 'acf'),
 	'name'		=> 'new_field',
 	'type'		=> 'text',
 	'parent'	=> $parent
@@ -26,32 +26,32 @@ 
 <div class="acf-field-list-wrap">
 	
 	<ul class="acf-hl acf-thead">
-		<li class="li-field-order"><?php _e('Order','acf'); ?></li>
-		<li class="li-field-label"><?php _e('Label','acf'); ?></li>
-		<li class="li-field-name"><?php _e('Name','acf'); ?></li>
-		<li class="li-field-type"><?php _e('Type','acf'); ?></li>
+		<li class="li-field-order"><?php _e('Order', 'acf'); ?></li>
+		<li class="li-field-label"><?php _e('Label', 'acf'); ?></li>
+		<li class="li-field-name"><?php _e('Name', 'acf'); ?></li>
+		<li class="li-field-type"><?php _e('Type', 'acf'); ?></li>
 	</ul>
 	
-	<div class="acf-field-list<?php if( $layout ){ echo " layout-{$layout}"; } ?>">
+	<div class="acf-field-list<?php if ($layout) { echo " layout-{$layout}"; } ?>">
 		
-		<?php foreach( $fields as $i => $field ): ?>
+		<?php foreach ($fields as $i => $field): ?>
 			
-			<?php acf_get_view('field-group-field', array( 'field' => $field, 'i' => $i )); ?>
+			<?php acf_get_view('field-group-field', array('field' => $field, 'i' => $i)); ?>
 			
 		<?php endforeach; ?>
 		
-		<div class="no-fields-message" <?php if(count($fields) > 1){ echo 'style="display:none;"'; } ?>>
-			<?php _e("No fields. Click the <strong>+ Add Field</strong> button to create your first field.",'acf'); ?>
+		<div class="no-fields-message" <?php if (count($fields) > 1) { echo 'style="display:none;"'; } ?>>
+			<?php _e("No fields. Click the <strong>+ Add Field</strong> button to create your first field.", 'acf'); ?>
 		</div>
 		
 	</div>
 	
 	<ul class="acf-hl acf-tfoot">
 		<li class="comic-sans">
-			<i class="acf-icon -arrow-combo"></i><?php _e('Drag and drop to reorder','acf'); ?>
+			<i class="acf-icon -arrow-combo"></i><?php _e('Drag and drop to reorder', 'acf'); ?>
 		</li>
 		<li class="acf-fr">
-			<a href="#" class="acf-button blue add-field"><?php _e('+ Add Field','acf'); ?></a>
+			<a href="#" class="acf-button blue add-field"><?php _e('+ Add Field', 'acf'); ?></a>
 		</li>
 	</ul>
 

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

Spacing +35 added lines, -35 removed lines

@@ -2,52 +2,52 @@ 
 
 // vars
 $rule_types = apply_filters('acf/location/rule_types', array(
-	__("Post",'acf') => array(
-		'post_type'		=>	__("Post Type",'acf'),
-		'post_status'	=>	__("Post Status",'acf'),
-		'post_format'	=>	__("Post Format",'acf'),
-		'post_category'	=>	__("Post Category",'acf'),
-		'post_taxonomy'	=>	__("Post Taxonomy",'acf'),
-		'post'			=>	__("Post",'acf')
+	__("Post", 'acf') => array(
+		'post_type'		=>	__("Post Type", 'acf'),
+		'post_status'	=>	__("Post Status", 'acf'),
+		'post_format'	=>	__("Post Format", 'acf'),
+		'post_category'	=>	__("Post Category", 'acf'),
+		'post_taxonomy'	=>	__("Post Taxonomy", 'acf'),
+		'post'			=>	__("Post", 'acf')
 	),
-	__("Page",'acf') => array(
-		'page_template'	=>	__("Page Template",'acf'),
-		'page_type'		=>	__("Page Type",'acf'),
-		'page_parent'	=>	__("Page Parent",'acf'),
-		'page'			=>	__("Page",'acf')
+	__("Page", 'acf') => array(
+		'page_template'	=>	__("Page Template", 'acf'),
+		'page_type'		=>	__("Page Type", 'acf'),
+		'page_parent'	=>	__("Page Parent", 'acf'),
+		'page'			=>	__("Page", 'acf')
 	),
-	__("User",'acf') => array(
-		'current_user'		=>	__("Current User",'acf'),
-		'current_user_role'	=>	__("Current User Role",'acf'),
-		'user_form'			=>	__("User Form",'acf'),
-		'user_role'			=>	__("User Role",'acf')
+	__("User", 'acf') => array(
+		'current_user'		=>	__("Current User", 'acf'),
+		'current_user_role'	=>	__("Current User Role", 'acf'),
+		'user_form'			=>	__("User Form", 'acf'),
+		'user_role'			=>	__("User Role", 'acf')
 	),
-	__("Forms",'acf') => array(
-		'attachment'	=>	__("Attachment",'acf'),
-		'taxonomy'		=>	__("Taxonomy Term",'acf'),
-		'comment'		=>	__("Comment",'acf'),
-		'widget'		=>	__("Widget",'acf')
+	__("Forms", 'acf') => array(
+		'attachment'	=>	__("Attachment", 'acf'),
+		'taxonomy'		=>	__("Taxonomy Term", 'acf'),
+		'comment'		=>	__("Comment", 'acf'),
+		'widget'		=>	__("Widget", 'acf')
 	)
 ));
 
-$rule_operators = apply_filters( 'acf/location/rule_operators', array(
-	'=='	=>	__("is equal to",'acf'),
-	'!='	=>	__("is not equal to",'acf'),
+$rule_operators = apply_filters('acf/location/rule_operators', array(
+	'=='	=>	__("is equal to", 'acf'),
+	'!='	=>	__("is not equal to", 'acf'),
 ));
 						
 ?>
 <div class="acf-field">
 	<div class="acf-label">
-		<label><?php _e("Rules",'acf'); ?></label>
-		<p><?php _e("Create a set of rules to determine which edit screens will use these advanced custom fields",'acf'); ?></p>
+		<label><?php _e("Rules", 'acf'); ?></label>
+		<p><?php _e("Create a set of rules to determine which edit screens will use these advanced custom fields", 'acf'); ?></p>
 	</div>
 	<div class="acf-input">
 		<div class="rule-groups">
 			
-			<?php foreach( $field_group['location'] as $group_id => $group ): 
+			<?php foreach ($field_group['location'] as $group_id => $group): 
 				
 				// validate
-				if( empty($group) ) {
+				if (empty($group)) {
 				
 					continue;
 					
@@ -56,7 +56,7 @@ 
 				
 				// $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 group if",'acf') : __("or",'acf');
+				$h4 = ($group_id == "group_0") ? __("Show this field group if", 'acf') : __("or", 'acf');
 				
 				?>
 			
@@ -66,10 +66,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'		=>	'',
@@ -119,7 +119,7 @@ 
 									
 								?></td>
 								<td class="add">
-									<a href="#" class="acf-button add-location-rule"><?php _e("and",'acf'); ?></a>
+									<a href="#" class="acf-button add-location-rule"><?php _e("and", 'acf'); ?></a>
 								</td>
 								<td class="remove">
 									<a href="#" class="acf-icon -minus remove-location-rule"></a>
@@ -132,9 +132,9 @@ 
 				</div>
 			<?php endforeach; ?>
 			
-			<h4><?php _e("or",'acf'); ?></h4>
+			<h4><?php _e("or", 'acf'); ?></h4>
 			
-			<a href="#" class="acf-button add-location-group"><?php _e("Add rule group",'acf'); ?></a>
+			<a href="#" class="acf-button add-location-group"><?php _e("Add rule group", 'acf'); ?></a>
 			
 		</div>
 	</div>

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

Spacing +23 added lines, -23 removed lines

@@ -2,46 +2,46 @@ 
 
 // active
 acf_render_field_wrap(array(
-	'label'			=> __('Status','acf'),
+	'label'			=> __('Status', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'active',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['active'],
 	'choices' 		=> array(
-		1				=>	__("Active",'acf'),
-		0				=>	__("Disabled",'acf'),
+		1				=>	__("Active", 'acf'),
+		0				=>	__("Disabled", 'acf'),
 	)
 ));
 
 
 // style
 acf_render_field_wrap(array(
-	'label'			=> __('Style','acf'),
+	'label'			=> __('Style', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'style',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['style'],
 	'choices' 		=> array(
-		'default'			=>	__("Standard (WP metabox)",'acf'),
-		'seamless'			=>	__("Seamless (no metabox)",'acf'),
+		'default'			=>	__("Standard (WP metabox)", 'acf'),
+		'seamless'			=>	__("Seamless (no metabox)", 'acf'),
 	)
 ));
 
 
 // position
 acf_render_field_wrap(array(
-	'label'			=> __('Position','acf'),
+	'label'			=> __('Position', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'position',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['position'],
 	'choices' 		=> array(
-		'acf_after_title'	=> __("High (after title)",'acf'),
-		'normal'			=> __("Normal (after content)",'acf'),
-		'side' 				=> __("Side",'acf'),
+		'acf_after_title'	=> __("High (after title)", 'acf'),
+		'normal'			=> __("Normal (after content)", 'acf'),
+		'side' 				=> __("Side", 'acf'),
 	),
 	'default_value'	=> 'normal'
 ));
@@ -49,38 +49,38 @@ 
 
 // label_placement
 acf_render_field_wrap(array(
-	'label'			=> __('Label placement','acf'),
+	'label'			=> __('Label placement', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'label_placement',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['label_placement'],
 	'choices' 		=> array(
-		'top'			=>	__("Top aligned",'acf'),
-		'left'			=>	__("Left Aligned",'acf'),
+		'top'			=>	__("Top aligned", 'acf'),
+		'left'			=>	__("Left Aligned", 'acf'),
 	)
 ));
 
 
 // instruction_placement
 acf_render_field_wrap(array(
-	'label'			=> __('Instruction placement','acf'),
+	'label'			=> __('Instruction placement', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'instruction_placement',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['instruction_placement'],
 	'choices' 		=> array(
-		'label'		=>	__("Below labels",'acf'),
-		'field'		=>	__("Below fields",'acf'),
+		'label'		=>	__("Below labels", 'acf'),
+		'field'		=>	__("Below fields", 'acf'),
 	)
 ));
 
 
 // menu_order
 acf_render_field_wrap(array(
-	'label'			=> __('Order No.','acf'),
-	'instructions'	=> __('Field groups with a lower order will appear first','acf'),
+	'label'			=> __('Order No.', 'acf'),
+	'instructions'	=> __('Field groups with a lower order will appear first', 'acf'),
 	'type'			=> 'number',
 	'name'			=> 'menu_order',
 	'prefix'		=> 'acf_field_group',
@@ -90,8 +90,8 @@ 
 
 // description
 acf_render_field_wrap(array(
-	'label'			=> __('Description','acf'),
-	'instructions'	=> __('Shown in field group list','acf'),
+	'label'			=> __('Description', 'acf'),
+	'instructions'	=> __('Shown in field group list', 'acf'),
 	'type'			=> 'text',
 	'name'			=> 'description',
 	'prefix'		=> 'acf_field_group',
@@ -101,8 +101,8 @@ 
 
 // hide on screen
 acf_render_field_wrap(array(
-	'label'			=> __('Hide on screen','acf'),
-	'instructions'	=> __('<b>Select</b> items to <b>hide</b> them from the edit screen.','acf') . '<br /><br />' . __("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)",'acf'),
+	'label'			=> __('Hide on screen', 'acf'),
+	'instructions'	=> __('<b>Select</b> items to <b>hide</b> them from the edit screen.', 'acf').'<br /><br />'.__("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)", 'acf'),
 	'type'			=> 'checkbox',
 	'name'			=> 'hide_on_screen',
 	'prefix'		=> 'acf_field_group',
@@ -110,7 +110,7 @@ 
 	'toggle'		=> true,
 	'choices' => array(
 		'permalink'			=>	__("Permalink", 'acf'),
-		'the_content'		=>	__("Content Editor",'acf'),
+		'the_content'		=>	__("Content Editor", 'acf'),
 		'excerpt'			=>	__("Excerpt", 'acf'),
 		'custom_fields'		=>	__("Custom Fields", 'acf'),
 		'discussion'		=>	__("Discussion", 'acf'),

includes/acf/admin/views/settings-addons.php

Indentation +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@
 				
 				$addon = acf_parse_args($addon, array(
 					"title"			=> "",
-			        "slug"			=> "",
-			        "description"	=> "",
-			        "thumbnail"		=> "",
-			        "url"			=> "",
-			        "btn"			=> __("Download & Install",'acf'),
-			        "btn_color"		=> ""
+					"slug"			=> "",
+					"description"	=> "",
+					"thumbnail"		=> "",
+					"url"			=> "",
+					"btn"			=> __("Download & Install",'acf'),
+					"btn_color"		=> ""
 				));
 				
 				?>

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
 <?php 
 
 // vars
-$json = acf_extract_var( $args, 'json');
+$json = acf_extract_var($args, 'json');
 
 ?>
 <div class="wrap acf-settings-wrap">
 	
-	<h1><?php _e("Add-ons",'acf'); ?></h1>
+	<h1><?php _e("Add-ons", 'acf'); ?></h1>
 	
 	<div class="add-ons-list acf-cf">
 		
-		<?php if( !empty($json) ): ?>
+		<?php if ( ! empty($json)): ?>
 			
-			<?php foreach( $json as $addon ): 
+			<?php foreach ($json as $addon): 
 				
 				$addon = acf_parse_args($addon, array(
 					"title"			=> "",
@@ -20,7 +20,7 @@ 
 			        "description"	=> "",
 			        "thumbnail"		=> "",
 			        "url"			=> "",
-			        "btn"			=> __("Download & Install",'acf'),
+			        "btn"			=> __("Download & Install", 'acf'),
 			        "btn_color"		=> ""
 				));
 				
@@ -38,13 +38,13 @@ 
 						<p><?php echo $addon['description']; ?></p>
 					</div>
 					<div class="footer">
-						<?php if( apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false ) ): ?>
-							<a class="acf-button" disabled="disabled"><?php _e("Installed",'acf'); ?></a>
+						<?php if (apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false)): ?>
+							<a class="acf-button" disabled="disabled"><?php _e("Installed", 'acf'); ?></a>
 						<?php else: ?>
 							<a class="acf-button <?php echo $addon['btn_color']; ?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
 						<?php endif; ?>
 						
-						<?php if( !empty($addon['footer']) ): ?>
+						<?php if ( ! empty($addon['footer'])): ?>
 							<p><?php echo $addon['footer']; ?></p>
 						<?php endif; ?>
 					</div>

Braces +5 added lines, -2 removed lines

@@ -40,8 +40,11 @@
 					<div class="footer">
 						<?php if( apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false ) ): ?>
 							<a class="acf-button" disabled="disabled"><?php _e("Installed",'acf'); ?></a>
-						<?php else: ?>
-							<a class="acf-button <?php echo $addon['btn_color']; ?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
+						<?php else {
+	: ?>
+							<a class="acf-button <?php echo $addon['btn_color'];
+}
+?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
 						<?php endif; ?>
 						
 						<?php if( !empty($addon['footer']) ): ?>