rousnay / lighthouse

includes/acf/fields/message.php

Spacing +22 added lines, -22 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_message') ) :
+if ( ! class_exists('acf_field_message')) :
 
 class acf_field_message extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'message';
-		$this->label = __("Message",'acf');
+		$this->label = __("Message", 'acf');
 		$this->category = 'layout';
 		$this->defaults = array(
 			'value'			=> false, // prevents acf_render_fields() from attempting to load value
@@ -60,30 +60,30 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$m = $field['message'];
 		
 		
 		// wptexturize (improves "quotes")
-		$m = wptexturize( $m );
+		$m = wptexturize($m);
 		
 		
 		// esc_html
-		if( $field['esc_html'] ) {
+		if ($field['esc_html']) {
 			
-			$m = esc_html( $m );
+			$m = esc_html($m);
 			
 		}
 		
 		
 		// new lines
-		if( $field['new_lines'] == 'wpautop' ) {
+		if ($field['new_lines'] == 'wpautop') {
 			
 			$m = wpautop($m);
 			
-		} elseif( $field['new_lines'] == 'br' ) {
+		} elseif ($field['new_lines'] == 'br') {
 			
 			$m = nl2br($m);
 			
@@ -109,11 +109,11 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Message','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Message', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'textarea',
 			'name'			=> 'message',
@@ -121,28 +121,28 @@ 
 		
 		
 		// formatting
-		acf_render_field_setting( $field, array(
-			'label'			=> __('New Lines','acf'),
-			'instructions'	=> __('Controls how new lines are rendered','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('New Lines', 'acf'),
+			'instructions'	=> __('Controls how new lines are rendered', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'new_lines',
 			'choices'		=> array(
-				'wpautop'		=> __("Automatically add paragraphs",'acf'),
-				'br'			=> __("Automatically add <br>",'acf'),
-				''				=> __("No Formatting",'acf')
+				'wpautop'		=> __("Automatically add paragraphs", 'acf'),
+				'br'			=> __("Automatically add <br>", 'acf'),
+				''				=> __("No Formatting", 'acf')
 			)
 		));
 		
 		
 		// HTML
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Escape HTML','acf'),
-			'instructions'	=> __('Allow HTML markup to display as visible text instead of rendering','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Escape HTML', 'acf'),
+			'instructions'	=> __('Allow HTML markup to display as visible text instead of rendering', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'esc_html',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));

includes/acf/fields/number.php

Spacing +45 added lines, -45 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_number') ) :
+if ( ! class_exists('acf_field_number')) :
 
 class acf_field_number extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'number';
-		$this->label = __("Number",'acf');
+		$this->label = __("Number", 'acf');
 		$this->defaults = array(
 			'default_value'	=> '',
 			'min'			=> '',
@@ -64,15 +64,15 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
-		$o = array( 'type', 'id', 'class', 'min', 'max', 'step', 'name', 'value', 'placeholder' );
+		$o = array('type', 'id', 'class', 'min', 'max', 'step', 'name', 'value', 'placeholder');
 		$e = '';
 		
 		
 		// step
-		if( !$field['step'] ) {
+		if ( ! $field['step']) {
 		
 			$field['step'] = 'any';
 			
@@ -80,38 +80,38 @@ 
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if ($field['prepend'] !== "") {
 		
 			$field['class'] .= ' acf-is-prepended';
-			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
+			$e .= '<div class="acf-input-prepend">'.$field['prepend'].'</div>';
 			
 		}
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if ($field['append'] !== "") {
 		
 			$field['class'] .= ' acf-is-appended';
-			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
+			$e .= '<div class="acf-input-append">'.$field['append'].'</div>';
 			
 		}
 		
 		
 		// populate atts
 		$atts = array();
-		foreach( $o as $k ) {
+		foreach ($o as $k) {
 		
-			$atts[ $k ] = $field[ $k ];	
+			$atts[$k] = $field[$k];	
 			
 		}
 		
 		
 		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		foreach (array('readonly', 'disabled') as $k) {
 		
-			if( $field[ $k ] ) {
+			if ($field[$k]) {
 			
-				$atts[ $k ] = $k;
+				$atts[$k] = $k;
 				
 			}
 			
@@ -120,7 +120,7 @@ 
 		
 		// render
 		$e .= '<div class="acf-input-wrap">';
-		$e .= '<input ' . acf_esc_attr( $atts ) . ' />';
+		$e .= '<input '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -143,47 +143,47 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// placeholder
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Placeholder Text','acf'),
-			'instructions'	=> __('Appears within the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Placeholder Text', 'acf'),
+			'instructions'	=> __('Appears within the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'placeholder',
 		));
 		
 		
 		// prepend
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Prepend','acf'),
-			'instructions'	=> __('Appears before the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Prepend', 'acf'),
+			'instructions'	=> __('Appears before the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'prepend',
 		));
 		
 		
 		// append
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Append','acf'),
-			'instructions'	=> __('Appears after the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Append', 'acf'),
+			'instructions'	=> __('Appears after the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'append',
 		));
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum Value','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum Value', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'min',
@@ -191,8 +191,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum Value','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum Value', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'max',
@@ -200,8 +200,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Step Size','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Step Size', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'step',
@@ -223,10 +223,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// remove ','
-		if( acf_str_exists(',', $value) ) {
+		if (acf_str_exists(',', $value)) {
 			
 			$value = str_replace(',', '', $value);
 			
@@ -234,10 +234,10 @@ 
 				
 		
 		// if value is not numeric...
-		if( !is_numeric($value) ) {
+		if ( ! is_numeric($value)) {
 			
 			// allow blank to be saved
-			if( !empty($value) ) {
+			if ( ! empty($value)) {
 				
 				$valid = __('Value must be a number', 'acf');
 				
@@ -255,17 +255,17 @@ 
 		
 		
 		// min
-		if( is_numeric($field['min']) && $value < floatval($field['min'])) {
+		if (is_numeric($field['min']) && $value < floatval($field['min'])) {
 			
-			$valid = sprintf(__('Value must be equal to or higher than %d', 'acf'), $field['min'] );
+			$valid = sprintf(__('Value must be equal to or higher than %d', 'acf'), $field['min']);
 			
 		}
 		
 		
 		// max
-		if( is_numeric($field['max']) && $value > floatval($field['max']) ) {
+		if (is_numeric($field['max']) && $value > floatval($field['max'])) {
 			
-			$valid = sprintf(__('Value must be equal to or lower than %d', 'acf'), $field['max'] );
+			$valid = sprintf(__('Value must be equal to or lower than %d', 'acf'), $field['max']);
 			
 		}
 		
@@ -292,10 +292,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// no formatting needed for empty value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 			
@@ -303,7 +303,7 @@ 
 		
 		
 		// remove ','
-		if( acf_str_exists(',', $value) ) {
+		if (acf_str_exists(',', $value)) {
 			
 			$value = str_replace(',', '', $value);
 			

includes/acf/fields/oembed.php

Spacing +24 added lines, -24 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_oembed') ) :
+if ( ! class_exists('acf_field_oembed')) :
 
 class acf_field_oembed extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'oembed';
-		$this->label = __("oEmbed",'acf');
+		$this->label = __("oEmbed", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'width'		=> '',
@@ -46,8 +46,8 @@ 
 
 		
 		// extra
-		add_action('wp_ajax_acf/fields/oembed/search',			array($this, 'ajax_search'));
-		add_action('wp_ajax_nopriv_acf/fields/oembed/search',	array($this, 'ajax_search'));
+		add_action('wp_ajax_acf/fields/oembed/search', array($this, 'ajax_search'));
+		add_action('wp_ajax_nopriv_acf/fields/oembed/search', array($this, 'ajax_search'));
 		
 		
 		// do not delete!
@@ -69,7 +69,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function wp_oembed_get( $url = '', $width = 0, $height = 0 ) {
+	function wp_oembed_get($url = '', $width = 0, $height = 0) {
 		
 		// vars
 		$embed = '';
@@ -80,11 +80,11 @@ 
 		
 		
 		// get emebed
-		$embed = @wp_oembed_get( $url, $res );
+		$embed = @wp_oembed_get($url, $res);
 		
 		
 		// try shortcode
-		if( !$embed ) {
+		if ( ! $embed) {
 			
 			 // global
 			global $wp_embed;
@@ -117,7 +117,7 @@ 
 	function ajax_search() {
 		
    		// options
-   		$args = acf_parse_args( $_POST, array(
+   		$args = acf_parse_args($_POST, array(
 			's'			=> '',
 			'nonce'		=> '',
 			'width'		=> 0,
@@ -126,13 +126,13 @@ 
 		
 		
 		// width and height
-		if( !$args['width'] ) {
+		if ( ! $args['width']) {
 		
 			$args['width'] = $this->default_values['width'];
 			
 		}
 		
-		if( !$args['height'] ) {
+		if ( ! $args['height']) {
 		
 			$args['height'] = $this->default_values['height'];
 			
@@ -140,7 +140,7 @@ 
 		
 		
 		// validate
-		if( ! wp_verify_nonce($args['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($args['nonce'], 'acf_nonce')) {
 		
 			die();
 			
@@ -169,14 +169,14 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// default options
-		foreach( $this->default_values as $k => $v ) {
+		foreach ($this->default_values as $k => $v) {
 		
-			if( empty($field[ $k ]) ) {
+			if (empty($field[$k])) {
 			
-				$field[ $k ] = $v;
+				$field[$k] = $v;
 				
 			}
 			
@@ -190,7 +190,7 @@ 
 			'data-height'	=> $field['height']
 		);
 		
-		if( $field['value'] ) {
+		if ($field['value']) {
 		
 			$atts['class'] .= ' has-value';
 			
@@ -226,7 +226,7 @@ 
 		</div>
 		
 		<div class="canvas-media" data-name="value-embed">
-			<?php if( !empty( $field['value'] ) ): ?>
+			<?php if ( ! empty($field['value'])): ?>
 				<?php echo $this->wp_oembed_get($field['value'], $field['width'], $field['height']); ?>
 			<?php endif; ?>
 		</div>
@@ -254,11 +254,11 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// width
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Embed Size','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Embed Size', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'width',
 			'prepend'		=> __('Width', 'acf'),
@@ -268,8 +268,8 @@ 
 		
 		
 		// height
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Embed Size','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Embed Size', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'height',
 			'prepend'		=> __('Height', 'acf'),
@@ -299,10 +299,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 		

includes/acf/fields/page_link.php

Spacing +94 added lines, -94 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_page_link') ) :
+if ( ! class_exists('acf_field_page_link')) :
 
 class acf_field_page_link extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'page_link';
-		$this->label = __("Page Link",'acf');
+		$this->label = __("Page Link", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'post_type'		=> array(),
@@ -44,8 +44,8 @@ 
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/page_link/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/page_link/query',		array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/page_link/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/page_link/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -67,7 +67,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
 		// defaults
    		$options = acf_parse_args($options, array(
@@ -90,9 +90,9 @@ 
    		
    		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -100,9 +100,9 @@ 
 		
 		
 		// update $args
-		if( !empty($field['post_type']) ) {
+		if ( ! empty($field['post_type'])) {
 		
-			$args['post_type'] = acf_get_array( $field['post_type'] );
+			$args['post_type'] = acf_get_array($field['post_type']);
 			
 		} else {
 			
@@ -111,18 +111,18 @@ 
 		}
 		
 		// create tax queries
-		if( !empty($field['taxonomy']) ) {
+		if ( ! empty($field['taxonomy'])) {
 			
 			// append to $args
 			$args['tax_query'] = array();
 			
 			
 			// decode terms
-			$taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
+			$taxonomies = acf_decode_taxonomy_terms($field['taxonomy']);
 			
 			
 			// now create the tax queries
-			foreach( $taxonomies as $taxonomy => $terms ) {
+			foreach ($taxonomies as $taxonomy => $terms) {
 			
 				$args['tax_query'][] = array(
 					'taxonomy'	=> $taxonomy,
@@ -135,7 +135,7 @@ 
 		
 				
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 		
 			$args['s'] = $options['s'];
 			
@@ -144,12 +144,12 @@ 
 		
 		// filters
 		$args = apply_filters('acf/fields/page_link/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/page_link/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/page_link/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/page_link/query/name='.$field['name'], $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/page_link/query/key='.$field['key'], $args, $field, $options['post_id']);
 		
 		
 		// add archives to $r
-		if( $args['paged'] == 1 ) {
+		if ($args['paged'] == 1) {
 			
 			$archives = array();
 			$archives[] = array(
@@ -157,11 +157,11 @@ 
 				'text'	=> home_url()
 			);
 			
-			foreach( $args['post_type'] as $post_type ) {
+			foreach ($args['post_type'] as $post_type) {
 				
-				$archive_link = get_post_type_archive_link( $post_type );
+				$archive_link = get_post_type_archive_link($post_type);
 				
-				if( $archive_link ) {
+				if ($archive_link) {
 				
 					$archives[] = array(
 						'id'	=> $archive_link,
@@ -174,11 +174,11 @@ 
 			
 			
 			// search
-			if( !empty($args['s']) ) {
+			if ( ! empty($args['s'])) {
 				
-				foreach( array_keys($archives) as $i ) {
+				foreach (array_keys($archives) as $i) {
 					
-					if( strpos( $archives[$i]['text'], $args['s'] ) === false ) {
+					if (strpos($archives[$i]['text'], $args['s']) === false) {
 						
 						unset($archives[$i]);
 						
@@ -191,7 +191,7 @@ 
 			}
 			
 			
-			if( !empty($archives) ) {
+			if ( ! empty($archives)) {
 				
 				$r[] = array(
 					'text'		=> __('Archives', 'acf'),
@@ -204,14 +204,14 @@ 
 		
 		
 		// get posts grouped by post type
-		$groups = acf_get_grouped_posts( $args );
+		$groups = acf_get_grouped_posts($args);
 		
-		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);
 				$titles = array();
 				
 				
@@ -222,28 +222,28 @@ 
 				);
 				
 				
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					// override data
-					$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+					$posts[$post_id] = $this->get_post_title($posts[$post_id], $field, $options['post_id']);
 					
 				};
 				
 				
 				// order by search
-				if( !empty($args['s']) ) {
+				if ( ! empty($args['s'])) {
 					
-					$posts = acf_order_by_search( $posts, $args['s'] );
+					$posts = acf_order_by_search($posts, $args['s']);
 					
 				}
 				
 				
 				// append to $data
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					$data['children'][] = array(
 						'id'	=> $post_id,
-						'text'	=> $posts[ $post_id ]
+						'text'	=> $posts[$post_id]
 					);
 					
 				}
@@ -279,7 +279,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -287,11 +287,11 @@ 
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$choices = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$choices ) {
+		if ( ! $choices) {
 			
 			die();
 			
@@ -299,7 +299,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $choices );
+		echo json_encode($choices);
 		die();
 			
 	}
@@ -320,14 +320,14 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_post_title( $post, $field, $post_id = 0 ) {
+	function get_post_title($post, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$form_data = acf_get_setting('form_data');
 			
-			if( !empty($form_data['post_id']) ) {
+			if ( ! empty($form_data['post_id'])) {
 				
 				$post_id = $form_data['post_id'];
 				
@@ -341,13 +341,13 @@ 
 		
 		
 		// vars
-		$title = acf_get_post_title( $post );
+		$title = acf_get_post_title($post);
 			
 		
 		// filters
 		$title = apply_filters('acf/fields/page_link/result', $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/page_link/result/name=' . $field['_name'], $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/page_link/result/key=' . $field['key'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/page_link/result/name='.$field['_name'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/page_link/result/key='.$field['key'], $title, $post, $field, $post_id);
 		
 		
 		// return
@@ -368,18 +368,18 @@ 
 	*  @return	$value
 	*/
 	
-	function get_posts( $value, $field ) {
+	function get_posts($value, $field) {
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// get selected post ID's
 		$post__in = array();
 		
-		foreach( $value as $k => $v ) {
+		foreach ($value as $k => $v) {
 			
-			if( is_numeric($v) ) {
+			if (is_numeric($v)) {
 				
 				// append to $post__in
 				$post__in[] = (int) $v;
@@ -390,7 +390,7 @@ 
 		
 		
 		// bail early if no posts
-		if( empty($post__in) ) {
+		if (empty($post__in)) {
 			
 			return $value;
 			
@@ -409,16 +409,16 @@ 
 		
 		
 		// append to $return
-		foreach( $value as $k => $v ) {
+		foreach ($value as $k => $v) {
 			
-			if( is_numeric($v) ) {
+			if (is_numeric($v)) {
 				
 				// extract first post
-				$post = array_shift( $posts );
+				$post = array_shift($posts);
 				
 				
 				// append
-				if( $post ) {
+				if ($post) {
 					
 					$return[] = $post;
 					
@@ -451,7 +451,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ){
+	function render_field($field) {
 		
 		// Change Field into a select
 		$field['type'] = 'select';
@@ -461,30 +461,30 @@ 
 		
 		
 		// populate choices if value exists
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			// get posts
-			$posts = $this->get_posts( $field['value'], $field );
+			$posts = $this->get_posts($field['value'], $field);
 			
 			
 			// set choices
-			if( !empty($posts) ) {
+			if ( ! empty($posts)) {
 				
-				foreach( array_keys($posts) as $i ) {
+				foreach (array_keys($posts) as $i) {
 					
 					// vars
-					$post = acf_extract_var( $posts, $i );
+					$post = acf_extract_var($posts, $i);
 					
 					
-					if( is_object($post) ) {
+					if (is_object($post)) {
 						
 						// append to choices
-						$field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
+						$field['choices'][$post->ID] = $this->get_post_title($post, $field);
 					
 					} else {
 						
 						// append to choices
-						$field['choices'][ $post ] = $post;
+						$field['choices'][$post] = $post;
 												
 					}
 					
@@ -496,7 +496,7 @@ 
 		
 		
 		// render
-		acf_render_field( $field );
+		acf_render_field($field);
 	}
 	
 	
@@ -513,11 +513,11 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// post_type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Post Type','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Post Type', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'post_type',
@@ -525,13 +525,13 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All post types",'acf'),
+			'placeholder'	=> __("All post types", 'acf'),
 		));
 		
 		
 		// taxonomy
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Taxonomy','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Taxonomy', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'taxonomy',
@@ -539,33 +539,33 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All taxonomies",'acf'),
+			'placeholder'	=> __("All taxonomies", 'acf'),
 		));
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// multiple
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Select multiple values?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Select multiple values?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'multiple',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -589,10 +589,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// ACF4 null
-		if( $value === 'null' ) {
+		if ($value === 'null') {
 		
 			return false;
 			
@@ -600,7 +600,7 @@ 
 		
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 		
@@ -608,32 +608,32 @@ 
 		
 		
 		// get posts
-		$value = $this->get_posts( $value, $field );
+		$value = $this->get_posts($value, $field);
 		
 		
 		// set choices
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
 			// vars
-			$post = acf_extract_var( $value, $i );
+			$post = acf_extract_var($value, $i);
 			
 			
 			// convert $post to permalink
-			if( is_object($post) ) {
+			if (is_object($post)) {
 				
-				$post = get_permalink( $post );
+				$post = get_permalink($post);
 			
 			}
 			
 			
 			// append back to $value
-			$value[ $i ] = $post;
+			$value[$i] = $post;
 			
 		}
 		
 			
 		// convert back from array if neccessary
-		if( !$field['multiple'] ) {
+		if ( ! $field['multiple']) {
 		
 			$value = array_shift($value);
 			
@@ -662,10 +662,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// validate
-		if( empty($value) ) {
+		if (empty($value)) {
 		
 			return $value;
 			
@@ -673,15 +673,15 @@ 
 		
 		
 		// format
-		if( is_array($value) ) {
+		if (is_array($value)) {
 			
 			// array
-			foreach( $value as $k => $v ){
+			foreach ($value as $k => $v) {
 			
 				// object?
-				if( is_object($v) && isset($v->ID) )
+				if (is_object($v) && isset($v->ID))
 				{
-					$value[ $k ] = $v->ID;
+					$value[$k] = $v->ID;
 				}
 			}
 			
@@ -689,7 +689,7 @@ 
 			// save value as strings, so we can clearly search for them in SQL LIKE statements
 			$value = array_map('strval', $value);
 			
-		} elseif( is_object($value) && isset($value->ID) ) {
+		} elseif (is_object($value) && isset($value->ID)) {
 			
 			// object
 			$value = $value->ID;

includes/acf/fields/password.php

Spacing +24 added lines, -24 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_password') ) :
+if ( ! class_exists('acf_field_password')) :
 
 class acf_field_password extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'password';
-		$this->label = __("Password",'acf');
+		$this->label = __("Password", 'acf');
 		$this->defaults = array(
 			'placeholder'	=> '',
 			'prepend'		=> '',
@@ -60,46 +60,46 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
-		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
+		$o = array('type', 'id', 'class', 'name', 'value', 'placeholder');
 		$e = '';
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if ($field['prepend'] !== "") {
 		
 			$field['class'] .= ' acf-is-prepended';
-			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
+			$e .= '<div class="acf-input-prepend">'.$field['prepend'].'</div>';
 			
 		}
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if ($field['append'] !== "") {
 		
 			$field['class'] .= ' acf-is-appended';
-			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
+			$e .= '<div class="acf-input-append">'.$field['append'].'</div>';
 			
 		}
 		
 		
 		// populate atts
 		$atts = array();
-		foreach( $o as $k ) {
+		foreach ($o as $k) {
 		
-			$atts[ $k ] = $field[ $k ];	
+			$atts[$k] = $field[$k];	
 			
 		}
 		
 		
 		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		foreach (array('readonly', 'disabled') as $k) {
 		
-			if( $field[ $k ] ) {
+			if ($field[$k]) {
 			
-				$atts[ $k ] = $k;
+				$atts[$k] = $k;
 				
 			}
 			
@@ -108,7 +108,7 @@ 
 		
 		// render
 		$e .= '<div class="acf-input-wrap">';
-		$e .= '<input ' . acf_esc_attr( $atts ) . ' />';
+		$e .= '<input '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -130,30 +130,30 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// placeholder
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Placeholder Text','acf'),
-			'instructions'	=> __('Appears within the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Placeholder Text', 'acf'),
+			'instructions'	=> __('Appears within the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'placeholder',
 		));
 		
 		
 		// prepend
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Prepend','acf'),
-			'instructions'	=> __('Appears before the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Prepend', 'acf'),
+			'instructions'	=> __('Appears before the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'prepend',
 		));
 		
 		
 		// append
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Append','acf'),
-			'instructions'	=> __('Appears after the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Append', 'acf'),
+			'instructions'	=> __('Appears after the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'append',
 		));

includes/acf/fields/post_object.php

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_post_object') ) :
+if ( ! class_exists('acf_field_post_object')) :
 
 class acf_field_post_object extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'post_object';
-		$this->label = __("Post Object",'acf');
+		$this->label = __("Post Object", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'post_type'		=> array(),
@@ -46,8 +46,8 @@ 
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/post_object/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/post_object/query',	array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/post_object/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/post_object/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -69,7 +69,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
 		// defaults
    		$options = acf_parse_args($options, array(
@@ -91,9 +91,9 @@ 
    		
    		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -101,9 +101,9 @@ 
 		
 		
 		// update $args
-		if( !empty($field['post_type']) ) {
+		if ( ! empty($field['post_type'])) {
 		
-			$args['post_type'] = acf_get_array( $field['post_type'] );
+			$args['post_type'] = acf_get_array($field['post_type']);
 			
 		} else {
 			
@@ -113,18 +113,18 @@ 
 
 		
 		// create tax queries
-		if( !empty($field['taxonomy']) ) {
+		if ( ! empty($field['taxonomy'])) {
 			
 			// append to $args
 			$args['tax_query'] = array();
 			
 			
 			// decode terms
-			$taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
+			$taxonomies = acf_decode_taxonomy_terms($field['taxonomy']);
 			
 			
 			// now create the tax queries
-			foreach( $taxonomies as $taxonomy => $terms ) {
+			foreach ($taxonomies as $taxonomy => $terms) {
 			
 				$args['tax_query'][] = array(
 					'taxonomy'	=> $taxonomy,
@@ -138,7 +138,7 @@ 
 		
 		
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 		
 			$args['s'] = $options['s'];
 			
@@ -147,19 +147,19 @@ 
 		
 		// filters
 		$args = apply_filters('acf/fields/post_object/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/post_object/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/post_object/query/name='.$field['name'], $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/post_object/query/key='.$field['key'], $args, $field, $options['post_id']);
 		
 		
 		// get posts grouped by post type
-		$groups = acf_get_grouped_posts( $args );
+		$groups = acf_get_grouped_posts($args);
 		
-		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);
 				$titles = array();
 				
 				
@@ -170,28 +170,28 @@ 
 				);
 				
 				
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					// override data
-					$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+					$posts[$post_id] = $this->get_post_title($posts[$post_id], $field, $options['post_id']);
 					
 				};
 				
 				
 				// order by search
-				if( !empty($args['s']) ) {
+				if ( ! empty($args['s'])) {
 					
-					$posts = acf_order_by_search( $posts, $args['s'] );
+					$posts = acf_order_by_search($posts, $args['s']);
 					
 				}
 				
 				
 				// append to $data
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					$data['children'][] = array(
 						'id'	=> $post_id,
-						'text'	=> $posts[ $post_id ]
+						'text'	=> $posts[$post_id]
 					);
 					
 				}
@@ -204,7 +204,7 @@ 
 			
 			
 			// optgroup or single
-			if( count($args['post_type']) == 1 ) {
+			if (count($args['post_type']) == 1) {
 				
 				$r = $r[0]['children'];
 				
@@ -235,7 +235,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -243,11 +243,11 @@ 
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$choices = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$choices ) {
+		if ( ! $choices) {
 			
 			die();
 			
@@ -255,7 +255,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $choices );
+		echo json_encode($choices);
 		die();
 			
 	}
@@ -276,14 +276,14 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_post_title( $post, $field, $post_id = 0 ) {
+	function get_post_title($post, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$form_data = acf_get_setting('form_data');
 			
-			if( !empty($form_data['post_id']) ) {
+			if ( ! empty($form_data['post_id'])) {
 				
 				$post_id = $form_data['post_id'];
 				
@@ -297,13 +297,13 @@ 
 		
 		
 		// vars
-		$title = acf_get_post_title( $post );
+		$title = acf_get_post_title($post);
 			
 		
 		// filters
 		$title = apply_filters('acf/fields/post_object/result', $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/post_object/result/name=' . $field['_name'], $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/post_object/result/key=' . $field['key'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/post_object/result/name='.$field['_name'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/post_object/result/key='.$field['key'], $title, $post, $field, $post_id);
 		
 		
 		// return
@@ -323,7 +323,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// Change Field into a select
 		$field['type'] = 'select';
@@ -333,7 +333,7 @@ 
 		
 		
 		// populate choices if value exists
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			// get posts
 			$posts = acf_get_posts(array(
@@ -343,16 +343,16 @@ 
 			
 			
 			// set choices
-			if( !empty($posts) ) {
+			if ( ! empty($posts)) {
 				
-				foreach( array_keys($posts) as $i ) {
+				foreach (array_keys($posts) as $i) {
 					
 					// vars
-					$post = acf_extract_var( $posts, $i );
+					$post = acf_extract_var($posts, $i);
 					
 					
 					// append to choices
-					$field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
+					$field['choices'][$post->ID] = $this->get_post_title($post, $field);
 					
 				}
 				
@@ -362,7 +362,7 @@ 
 
 		
 		// render
-		acf_render_field( $field );
+		acf_render_field($field);
 	}
 	
 	
@@ -379,11 +379,11 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Post Type','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Post Type', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'post_type',
@@ -391,13 +391,13 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All post types",'acf'),
+			'placeholder'	=> __("All post types", 'acf'),
 		));
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Taxonomy','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Taxonomy', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'taxonomy',
@@ -405,47 +405,47 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All taxonomies",'acf'),
+			'placeholder'	=> __("All taxonomies", 'acf'),
 		));
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// multiple
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Select multiple values?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Select multiple values?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'multiple',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return Format','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return Format', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'choices'		=> array(
-				'object'		=> __("Post Object",'acf'),
-				'id'			=> __("Post ID",'acf'),
+				'object'		=> __("Post Object", 'acf'),
+				'id'			=> __("Post ID", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -468,10 +468,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// ACF4 null
-		if( $value === 'null' ) {
+		if ($value === 'null') {
 		
 			return false;
 			
@@ -499,10 +499,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 		
@@ -510,7 +510,7 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// convert values to int
@@ -518,7 +518,7 @@ 
 		
 		
 		// load posts if needed
-		if( $field['return_format'] == 'object' ) {
+		if ($field['return_format'] == 'object') {
 			
 			// get posts
 			$value = acf_get_posts(array(
@@ -530,7 +530,7 @@ 
 		
 		
 		// convert back from array if neccessary
-		if( !$field['multiple'] ) {
+		if ( ! $field['multiple']) {
 		
 			$value = array_shift($value);
 			
@@ -559,10 +559,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// validate
-		if( empty($value) ) {
+		if (empty($value)) {
 		
 			return $value;
 			
@@ -570,15 +570,15 @@ 
 		
 		
 		// format
-		if( is_array($value) ) {
+		if (is_array($value)) {
 			
 			// array
-			foreach( $value as $k => $v ){
+			foreach ($value as $k => $v) {
 			
 				// object?
-				if( is_object($v) && isset($v->ID) ) {
+				if (is_object($v) && isset($v->ID)) {
 					
-					$value[ $k ] = $v->ID;
+					$value[$k] = $v->ID;
 				
 				}
 			
@@ -588,7 +588,7 @@ 
 			// save value as strings, so we can clearly search for them in SQL LIKE statements
 			$value = array_map('strval', $value);
 			
-		} elseif( is_object($value) && isset($value->ID) ) {
+		} elseif (is_object($value) && isset($value->ID)) {
 			
 			// object
 			$value = $value->ID;

includes/acf/fields/radio.php

Spacing +41 added lines, -41 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_radio') ) :
+if ( ! class_exists('acf_field_radio')) :
 
 class acf_field_radio extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'radio';
-		$this->label = __("Radio Button",'acf');
+		$this->label = __("Radio Button", 'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
 			'layout'			=> 'vertical',
@@ -65,7 +65,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$i = 0;
@@ -78,11 +78,11 @@ 
 
 		
 		// e
-		$e = '<ul ' . acf_esc_attr(array( 'class' => $field['class'] )) . '>';
+		$e = '<ul '.acf_esc_attr(array('class' => $field['class'])).'>';
 		
 		
 		// other choice
-		if( $field['other_choice'] ) {
+		if ($field['other_choice']) {
 			
 			// vars
 			$input = array(
@@ -94,7 +94,7 @@ 
 			
 			
 			// select other choice if value is not a valid choice
-			if( !isset($field['choices'][ $field['value'] ]) ) {
+			if ( ! isset($field['choices'][$field['value']])) {
 				
 				unset($input['disabled']);
 				$input['value'] = $field['value'];
@@ -103,16 +103,16 @@ 
 			}
 			
 			
-			$field['choices']['other'] = '</label><input type="text" ' . acf_esc_attr($input) . ' /><label>';
+			$field['choices']['other'] = '</label><input type="text" '.acf_esc_attr($input).' /><label>';
 		
 		}
 		
 		
 		// require choices
-		if( !empty($field['choices']) ) {
+		if ( ! empty($field['choices'])) {
 			
 			// select first choice if value is not a valid choice
-			if( !isset($field['choices'][ $field['value'] ]) ) {
+			if ( ! isset($field['choices'][$field['value']])) {
 				
 				$field['value'] = key($field['choices']);
 				
@@ -120,7 +120,7 @@ 
 			
 			
 			// foreach choices
-			foreach( $field['choices'] as $value => $label ) {
+			foreach ($field['choices'] as $value => $label) {
 				
 				// increase counter
 				$i++;
@@ -135,14 +135,14 @@ 
 				);
 				
 				
-				if( strval($value) === strval($field['value']) ) {
+				if (strval($value) === strval($field['value'])) {
 					
 					$atts['checked'] = 'checked';
 					$checked = true;
 					
 				}
 				
-				if( isset($field['disabled']) && acf_in_array($value, $field['disabled']) ) {
+				if (isset($field['disabled']) && acf_in_array($value, $field['disabled'])) {
 				
 					$atts['disabled'] = 'disabled';
 					
@@ -150,13 +150,13 @@ 
 				
 				
 				// each input ID is generated with the $key, however, the first input must not use $key so that it matches the field's label for attribute
-				if( $i > 1 ) {
+				if ($i > 1) {
 				
-					$atts['id'] .= '-' . $value;
+					$atts['id'] .= '-'.$value;
 					
 				}
 				
-				$e .= '<li><label><input ' . acf_esc_attr( $atts ) . '/>' . $label . '</label></li>';
+				$e .= '<li><label><input '.acf_esc_attr($atts).'/>'.$label.'</label></li>';
 			}
 		
 		}
@@ -182,24 +182,24 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// encode choices (convert from array)
 		$field['choices'] = acf_encode_choices($field['choices']);
 		
 		
 		// choices
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Choices','acf'),
-			'instructions'	=> __('Enter each choice on a new line.','acf') . '<br /><br />' . __('For more control, you may specify both a value and label like this:','acf'). '<br /><br />' . __('red : Red','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Choices', 'acf'),
+			'instructions'	=> __('Enter each choice on a new line.', 'acf').'<br /><br />'.__('For more control, you may specify both a value and label like this:', 'acf').'<br /><br />'.__('red : Red', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'choices',
 		));
 		
 		
 		// other_choice
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Other','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Other', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'true_false',
 			'name'			=> 'other_choice',
@@ -208,8 +208,8 @@ 
 		
 		
 		// save_other_choice
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Save Other','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Save Other', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'true_false',
 			'name'			=> 'save_other_choice',
@@ -218,24 +218,24 @@ 
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// layout
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Layout','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Layout', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'layout',
 			'layout'		=> 'horizontal', 
 			'choices'		=> array(
-				'vertical'		=> __("Vertical",'acf'), 
-				'horizontal'	=> __("Horizontal",'acf')
+				'vertical'		=> __("Vertical", 'acf'), 
+				'horizontal'	=> __("Horizontal", 'acf')
 			)
 		));
 		
@@ -258,7 +258,7 @@ 
 	*  @return	$field - the modified field
 	*/
 
-	function update_field( $field ) {
+	function update_field($field) {
 		
 		// decode choices (convert to array)
 		$field['choices'] = acf_decode_choices($field['choices']);
@@ -286,24 +286,24 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// save_other_choice
-		if( $field['save_other_choice'] ) {
+		if ($field['save_other_choice']) {
 			
 			// value isn't in choices yet
-			if( !isset($field['choices'][ $value ]) ) {
+			if ( ! isset($field['choices'][$value])) {
 				
 				// get ID if local
-				if( !$field['ID'] ) {
+				if ( ! $field['ID']) {
 					
-					$field = acf_get_field( $field['key'], true );
+					$field = acf_get_field($field['key'], true);
 					
 				}
 				
 				
 				// bail early if no ID
-				if( !$field['ID'] ) {
+				if ( ! $field['ID']) {
 					
 					return $value;
 					
@@ -311,11 +311,11 @@ 
 				
 				
 				// update $field
-				$field['choices'][ $value ] = $value;
+				$field['choices'][$value] = $value;
 				
 				
 				// save
-				acf_update_field( $field );
+				acf_update_field($field);
 				
 			}
 			
@@ -343,10 +343,10 @@ 
 	*  @return	$value - the value to be saved in te database
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// must be single value
-		if( is_array($value) ) {
+		if (is_array($value)) {
 			
 			$value = array_pop($value);
 			

includes/acf/fields/relationship.php

Spacing +137 added lines, -137 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_relationship') ) :
+if ( ! class_exists('acf_field_relationship')) :
 
 class acf_field_relationship extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'relationship';
-		$this->label = __("Relationship",'acf');
+		$this->label = __("Relationship", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'post_type'			=> array(),
@@ -45,16 +45,16 @@ 
 			'return_format'		=> 'object'
 		);
 		$this->l10n = array(
-			'min'		=> __("Minimum values reached ( {min} values )",'acf'),
-			'max'		=> __("Maximum values reached ( {max} values )",'acf'),
-			'loading'	=> __('Loading','acf'),
-			'empty'		=> __('No matches found','acf'),
+			'min'		=> __("Minimum values reached ( {min} values )", 'acf'),
+			'max'		=> __("Maximum values reached ( {max} values )", 'acf'),
+			'loading'	=> __('Loading', 'acf'),
+			'empty'		=> __('No matches found', 'acf'),
 		);
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/relationship/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/relationship/query',	array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/relationship/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/relationship/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -76,7 +76,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
    		// defaults
    		$options = acf_parse_args($options, array(
@@ -101,9 +101,9 @@ 
    		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -111,13 +111,13 @@ 
 		
 		
 		// update $args
-		if( !empty($options['post_type']) ) {
+		if ( ! empty($options['post_type'])) {
 			
-			$args['post_type'] = acf_get_array( $options['post_type'] );
+			$args['post_type'] = acf_get_array($options['post_type']);
 		
-		} elseif( !empty($field['post_type']) ) {
+		} elseif ( ! empty($field['post_type'])) {
 		
-			$args['post_type'] = acf_get_array( $field['post_type'] );
+			$args['post_type'] = acf_get_array($field['post_type']);
 			
 		} else {
 			
@@ -128,7 +128,7 @@ 
 		// update taxonomy
 		$taxonomies = array();
 		
-		if( !empty($options['taxonomy']) ) {
+		if ( ! empty($options['taxonomy'])) {
 			
 			$term = acf_decode_taxonomy_term($options['taxonomy']);
 			
@@ -144,16 +144,16 @@ 
 			);
 			
 			
-		} elseif( !empty($field['taxonomy']) ) {
+		} elseif ( ! empty($field['taxonomy'])) {
 			
-			$taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
+			$taxonomies = acf_decode_taxonomy_terms($field['taxonomy']);
 			
 			// append to $args
 			$args['tax_query'] = array();
 			
 			
 			// now create the tax queries
-			foreach( $taxonomies as $taxonomy => $terms ) {
+			foreach ($taxonomies as $taxonomy => $terms) {
 			
 				$args['tax_query'][] = array(
 					'taxonomy'	=> $taxonomy,
@@ -167,7 +167,7 @@ 
 		
 		
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 		
 			$args['s'] = $options['s'];
 			
@@ -176,19 +176,19 @@ 
 		
 		// filters
 		$args = apply_filters('acf/fields/relationship/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/relationship/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/relationship/query/name='.$field['name'], $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/relationship/query/key='.$field['key'], $args, $field, $options['post_id']);
 		
 		
 		// get posts grouped by post type
-		$groups = acf_get_grouped_posts( $args );
+		$groups = acf_get_grouped_posts($args);
 		
-		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);
 				$titles = array();
 				
 				
@@ -199,28 +199,28 @@ 
 				);
 				
 				
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					// override data
-					$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+					$posts[$post_id] = $this->get_post_title($posts[$post_id], $field, $options['post_id']);
 					
 				};
 				
 				
 				// order by search
-				if( !empty($args['s']) ) {
+				if ( ! empty($args['s'])) {
 					
-					$posts = acf_order_by_search( $posts, $args['s'] );
+					$posts = acf_order_by_search($posts, $args['s']);
 					
 				}
 				
 				
 				// append to $data
-				foreach( array_keys($posts) as $post_id ) {
+				foreach (array_keys($posts) as $post_id) {
 					
 					$data['children'][] = array(
 						'id'	=> $post_id,
-						'text'	=> $posts[ $post_id ]
+						'text'	=> $posts[$post_id]
 					);
 					
 				}
@@ -233,7 +233,7 @@ 
 			
 			
 			// add as optgroup or results
-			if( count($args['post_type']) == 1 ) {
+			if (count($args['post_type']) == 1) {
 				
 				$r = $r[0]['children'];
 				
@@ -264,7 +264,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -272,11 +272,11 @@ 
 		
 		
 		// get posts
-		$posts = $this->get_choices( $_POST );
+		$posts = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$posts ) {
+		if ( ! $posts) {
 			
 			die();
 			
@@ -284,7 +284,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $posts );
+		echo json_encode($posts);
 		die();
 			
 	}
@@ -305,10 +305,10 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_post_title( $post, $field, $post_id = 0 ) {
+	function get_post_title($post, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$post_id = acf_get_setting('form_data/post_id', get_the_ID());
 			
@@ -316,28 +316,28 @@ 
 		
 		
 		// vars
-		$title = acf_get_post_title( $post );
+		$title = acf_get_post_title($post);
 		
 		
 		// elements
-		if( !empty($field['elements']) ) {
+		if ( ! empty($field['elements'])) {
 			
-			if( in_array('featured_image', $field['elements']) ) {
+			if (in_array('featured_image', $field['elements'])) {
 				
 				$image = '';
 				
-				if( $post->post_type == 'attachment' ) {
+				if ($post->post_type == 'attachment') {
 					
-					$image = wp_get_attachment_image( $post->ID, array(17, 17) );
+					$image = wp_get_attachment_image($post->ID, array(17, 17));
 					
 				} else {
 					
-					$image = get_the_post_thumbnail( $post->ID, array(17, 17) );
+					$image = get_the_post_thumbnail($post->ID, array(17, 17));
 					
 				}
 				
 				
-				$title = '<div class="thumbnail">' . $image . '</div>' . $title;
+				$title = '<div class="thumbnail">'.$image.'</div>'.$title;
 			}
 			
 		}
@@ -345,8 +345,8 @@ 
 		
 		// filters
 		$title = apply_filters('acf/fields/relationship/result', $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/relationship/result/name=' . $field['_name'], $title, $post, $field, $post_id);
-		$title = apply_filters('acf/fields/relationship/result/key=' . $field['key'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/relationship/result/name='.$field['_name'], $title, $post, $field, $post_id);
+		$title = apply_filters('acf/fields/relationship/result/key='.$field['key'], $title, $post, $field, $post_id);
 		
 		
 		// return
@@ -367,7 +367,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$values = array();
@@ -384,7 +384,7 @@ 
 		
 		
 		// Lang
-		if( defined('ICL_LANGUAGE_CODE') ) {
+		if (defined('ICL_LANGUAGE_CODE')) {
 		
 			$atts['data-lang'] = ICL_LANGUAGE_CODE;
 			
@@ -392,8 +392,8 @@ 
 		
 		
 		// data types
-		$field['post_type'] = acf_get_array( $field['post_type'] );
-		$field['taxonomy'] = acf_get_array( $field['taxonomy'] );
+		$field['post_type'] = acf_get_array($field['post_type']);
+		$field['taxonomy'] = acf_get_array($field['taxonomy']);
 		
 		
 		// width for select filters
@@ -403,7 +403,7 @@ 
 			'taxonomy'	=> 0
 		);
 		
-		if( !empty($field['filters']) ) {
+		if ( ! empty($field['filters'])) {
 			
 			$width = array(
 				'search'	=> 50,
@@ -411,11 +411,11 @@ 
 				'taxonomy'	=> 25
 			);
 			
-			foreach( array_keys($width) as $k ) {
+			foreach (array_keys($width) as $k) {
 				
-				if( ! in_array($k, $field['filters']) ) {
+				if ( ! in_array($k, $field['filters'])) {
 				
-					$width[ $k ] = 0;
+					$width[$k] = 0;
 					
 				}
 				
@@ -423,33 +423,33 @@ 
 			
 			
 			// search
-			if( $width['search'] == 0 ) {
+			if ($width['search'] == 0) {
 			
-				$width['post_type'] = ( $width['post_type'] == 0 ) ? 0 : 50;
-				$width['taxonomy'] = ( $width['taxonomy'] == 0 ) ? 0 : 50;
+				$width['post_type'] = ($width['post_type'] == 0) ? 0 : 50;
+				$width['taxonomy'] = ($width['taxonomy'] == 0) ? 0 : 50;
 				
 			}
 			
 			// post_type
-			if( $width['post_type'] == 0 ) {
+			if ($width['post_type'] == 0) {
 			
-				$width['taxonomy'] = ( $width['taxonomy'] == 0 ) ? 0 : 50;
+				$width['taxonomy'] = ($width['taxonomy'] == 0) ? 0 : 50;
 				
 			}
 			
 			
 			// taxonomy
-			if( $width['taxonomy'] == 0 ) {
+			if ($width['taxonomy'] == 0) {
 			
-				$width['post_type'] = ( $width['post_type'] == 0 ) ? 0 : 50;
+				$width['post_type'] = ($width['post_type'] == 0) ? 0 : 50;
 				
 			}
 			
 			
 			// search
-			if( $width['post_type'] == 0 && $width['taxonomy'] == 0 ) {
+			if ($width['post_type'] == 0 && $width['taxonomy'] == 0) {
 			
-				$width['search'] = ( $width['search'] == 0 ) ? 0 : 100;
+				$width['search'] = ($width['search'] == 0) ? 0 : 100;
 				
 			}
 		}
@@ -458,9 +458,9 @@ 
 		// post type filter
 		$post_types = array();
 		
-		if( $width['post_type'] ) {
+		if ($width['post_type']) {
 			
-			if( !empty($field['post_type']) ) {
+			if ( ! empty($field['post_type'])) {
 			
 				$post_types = $field['post_type'];
 	
@@ -480,36 +480,36 @@ 
 		$taxonomies = array();
 		$term_groups = array();
 		
-		if( $width['taxonomy'] ) {
+		if ($width['taxonomy']) {
 			
 			// taxonomies
-			if( !empty($field['taxonomy']) ) {
+			if ( ! empty($field['taxonomy'])) {
 				
 				// get the field's terms
-				$term_groups = acf_get_array( $field['taxonomy'] );
-				$term_groups = acf_decode_taxonomy_terms( $term_groups );
+				$term_groups = acf_get_array($field['taxonomy']);
+				$term_groups = acf_decode_taxonomy_terms($term_groups);
 				
 				
 				// update taxonomies
 				$taxonomies = array_keys($term_groups);
 			
-			} elseif( !empty($field['post_type']) ) {
+			} elseif ( ! empty($field['post_type'])) {
 				
 				// loop over post types and find connected taxonomies
-				foreach( $field['post_type'] as $post_type ) {
+				foreach ($field['post_type'] as $post_type) {
 					
-					$post_taxonomies = get_object_taxonomies( $post_type );
+					$post_taxonomies = get_object_taxonomies($post_type);
 					
 					// bail early if no taxonomies
-					if( empty($post_taxonomies) ) {
+					if (empty($post_taxonomies)) {
 						
 						continue;
 						
 					}
 						
-					foreach( $post_taxonomies as $post_taxonomy ) {
+					foreach ($post_taxonomies as $post_taxonomy) {
 						
-						if( !in_array($post_taxonomy, $taxonomies) ) {
+						if ( ! in_array($post_taxonomy, $taxonomies)) {
 							
 							$taxonomies[] = $post_taxonomy;
 							
@@ -527,19 +527,19 @@ 
 			
 			
 			// terms
-			$term_groups = acf_get_taxonomy_terms( $taxonomies );
+			$term_groups = acf_get_taxonomy_terms($taxonomies);
 			
 			
 			// update $term_groups with specific terms
-			if( !empty($field['taxonomy']) ) {
+			if ( ! empty($field['taxonomy'])) {
 				
-				foreach( array_keys($term_groups) as $taxonomy ) {
+				foreach (array_keys($term_groups) as $taxonomy) {
 					
-					foreach( array_keys($term_groups[ $taxonomy ]) as $term ) {
+					foreach (array_keys($term_groups[$taxonomy]) as $term) {
 						
-						if( ! in_array($term, $field['taxonomy']) ) {
+						if ( ! in_array($term, $field['taxonomy'])) {
 							
-							unset($term_groups[ $taxonomy ][ $term ]);
+							unset($term_groups[$taxonomy][$term]);
 							
 						}
 						
@@ -559,25 +559,25 @@ 
 		<input type="hidden" name="<?php echo $field['name']; ?>" value="" />
 	</div>
 	
-	<?php if( $width['search'] || $width['post_type'] || $width['taxonomy'] ): ?>
+	<?php if ($width['search'] || $width['post_type'] || $width['taxonomy']): ?>
 	<div class="filters">
 		
 		<ul class="acf-hl">
 		
-			<?php if( $width['search'] ): ?>
+			<?php if ($width['search']): ?>
 			<li style="width:<?php echo $width['search']; ?>%;">
 				<div class="inner">
-				<input class="filter" data-filter="s" placeholder="<?php _e("Search...",'acf'); ?>" type="text" />
+				<input class="filter" data-filter="s" placeholder="<?php _e("Search...", 'acf'); ?>" type="text" />
 				</div>
 			</li>
 			<?php endif; ?>
 			
-			<?php if( $width['post_type'] ): ?>
+			<?php if ($width['post_type']): ?>
 			<li style="width:<?php echo $width['post_type']; ?>%;">
 				<div class="inner">
 				<select class="filter" data-filter="post_type">
-					<option value=""><?php _e('Select post type','acf'); ?></option>
-					<?php foreach( $post_types as $k => $v ): ?>
+					<option value=""><?php _e('Select post type', 'acf'); ?></option>
+					<?php foreach ($post_types as $k => $v): ?>
 						<option value="<?php echo $k; ?>"><?php echo $v; ?></option>
 					<?php endforeach; ?>
 				</select>
@@ -585,14 +585,14 @@ 
 			</li>
 			<?php endif; ?>
 			
-			<?php if( $width['taxonomy'] ): ?>
+			<?php if ($width['taxonomy']): ?>
 			<li style="width:<?php echo $width['taxonomy']; ?>%;">
 				<div class="inner">
 				<select class="filter" data-filter="taxonomy">
-					<option value=""><?php _e('Select taxonomy','acf'); ?></option>
-					<?php foreach( $term_groups as $k_opt => $v_opt ): ?>
+					<option value=""><?php _e('Select taxonomy', 'acf'); ?></option>
+					<?php foreach ($term_groups as $k_opt => $v_opt): ?>
 						<optgroup label="<?php echo $k_opt; ?>">
-							<?php foreach( $v_opt as $k => $v ): ?>
+							<?php foreach ($v_opt as $k => $v): ?>
 								<option value="<?php echo $k; ?>"><?php echo $v; ?></option>
 							<?php endforeach; ?>
 						</optgroup>
@@ -618,7 +618,7 @@ 
 		
 			<ul class="acf-bl list">
 			
-				<?php if( !empty($field['value']) ): 
+				<?php if ( ! empty($field['value'])): 
 					
 					// get posts
 					$posts = acf_get_posts(array(
@@ -628,18 +628,18 @@ 
 					
 					
 					// set choices
-					if( !empty($posts) ):
+					if ( ! empty($posts)):
 						
-						foreach( array_keys($posts) as $i ):
+						foreach (array_keys($posts) as $i):
 							
 							// vars
-							$post = acf_extract_var( $posts, $i );
+							$post = acf_extract_var($posts, $i);
 							
 							
 							?><li>
 								<input type="hidden" name="<?php echo $field['name']; ?>[]" value="<?php echo $post->ID; ?>" />
 								<span data-id="<?php echo $post->ID; ?>" class="acf-rel-item">
-									<?php echo $this->get_post_title( $post, $field ); ?>
+									<?php echo $this->get_post_title($post, $field); ?>
 									<a href="#" class="acf-icon -minus small dark" data-name="remove_item"></a>
 								</span>
 							</li><?php
@@ -677,7 +677,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// vars
 		$field['min'] = empty($field['min']) ? '' : $field['min'];
@@ -685,8 +685,8 @@ 
 		
 		
 		// post_type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Post Type','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Post Type', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'post_type',
@@ -694,13 +694,13 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All post types",'acf'),
+			'placeholder'	=> __("All post types", 'acf'),
 		));
 		
 		
 		// taxonomy
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by Taxonomy','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by Taxonomy', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'taxonomy',
@@ -708,39 +708,39 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All taxonomies",'acf'),
+			'placeholder'	=> __("All taxonomies", 'acf'),
 		));
 		
 		
 		// filters
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filters','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filters', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'checkbox',
 			'name'			=> 'filters',
 			'choices'		=> array(
-				'search'		=> __("Search",'acf'),
-				'post_type'		=> __("Post Type",'acf'),
-				'taxonomy'		=> __("Taxonomy",'acf'),
+				'search'		=> __("Search", 'acf'),
+				'post_type'		=> __("Post Type", 'acf'),
+				'taxonomy'		=> __("Taxonomy", 'acf'),
 			),
 		));
 		
 		
 		// filters
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Elements','acf'),
-			'instructions'	=> __('Selected elements will be displayed in each result','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Elements', 'acf'),
+			'instructions'	=> __('Selected elements will be displayed in each result', 'acf'),
 			'type'			=> 'checkbox',
 			'name'			=> 'elements',
 			'choices'		=> array(
-				'featured_image'	=> __("Featured Image",'acf'),
+				'featured_image'	=> __("Featured Image", 'acf'),
 			),
 		));
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum posts','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum posts', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'min',
@@ -748,8 +748,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum posts','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum posts', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'max',
@@ -759,14 +759,14 @@ 
 		
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return Format','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return Format', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'choices'		=> array(
-				'object'		=> __("Post Object",'acf'),
-				'id'			=> __("Post ID",'acf'),
+				'object'		=> __("Post Object", 'acf'),
+				'id'			=> __("Post ID", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -791,10 +791,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 		
 			return $value;
 			
@@ -802,7 +802,7 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// convert to int
@@ -810,7 +810,7 @@ 
 		
 		
 		// load posts if needed
-		if( $field['return_format'] == 'object' ) {
+		if ($field['return_format'] == 'object') {
 			
 			// get posts
 			$value = acf_get_posts(array(
@@ -840,10 +840,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// default
-		if( empty($value) || !is_array($value) ) {
+		if (empty($value) || ! is_array($value)) {
 		
 			$value = array();
 			
@@ -851,10 +851,10 @@ 
 		
 		
 		// min
-		if( count($value) < $field['min'] ) {
+		if (count($value) < $field['min']) {
 		
-			$valid = _n( '%s requires at least %s selection', '%s requires at least %s selections', $field['min'], 'acf' );
-			$valid = sprintf( $valid, $field['label'], $field['min'] );
+			$valid = _n('%s requires at least %s selection', '%s requires at least %s selections', $field['min'], 'acf');
+			$valid = sprintf($valid, $field['label'], $field['min']);
 			
 		}
 		
@@ -881,10 +881,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// validate
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			return $value;
 			
@@ -892,16 +892,16 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 					
 		// array
-		foreach( $value as $k => $v ){
+		foreach ($value as $k => $v) {
 		
 			// object?
-			if( is_object($v) && isset($v->ID) ) {
+			if (is_object($v) && isset($v->ID)) {
 			
-				$value[ $k ] = $v->ID;
+				$value[$k] = $v->ID;
 				
 			}
 			

includes/acf/fields/select.php

Spacing +74 added lines, -74 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_select') ) :
+if ( ! class_exists('acf_field_select')) :
 
 class acf_field_select extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'select';
-		$this->label = __("Select",'acf');
+		$this->label = __("Select", 'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
 			'multiple' 		=> 0,
@@ -49,8 +49,8 @@ 
 		
 		
 		// ajax
-		add_action('wp_ajax_acf/fields/select/query',				array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/select/query',		array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/select/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/select/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -75,7 +75,7 @@ 
 	function ajax_query() {
 		
    		// options
-   		$options = acf_parse_args( $_POST, array(
+   		$options = acf_parse_args($_POST, array(
 			'post_id'					=>	0,
 			's'							=>	'',
 			'field_key'					=>	'',
@@ -84,9 +84,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			die();
 			
@@ -99,7 +99,7 @@ 
 		
 		
 		// search
-		if( $options['s'] !== '' ) {
+		if ($options['s'] !== '') {
 			
 			// search may be integer
 			$s = strval($options['s']);
@@ -112,12 +112,12 @@ 
 		
 		
 		// loop through choices
-		if( !empty($field['choices']) ) {
+		if ( ! empty($field['choices'])) {
 		
-			foreach( $field['choices'] as $k => $v ) {
+			foreach ($field['choices'] as $k => $v) {
 				
 				// if searching, but doesn't exist
-				if( $s !== false && stripos($v, $s) === false ) {
+				if ($s !== false && stripos($v, $s) === false) {
 				
 					continue;
 					
@@ -127,7 +127,7 @@ 
 				// append
 				$r[] = array(
 					'id'	=> $k,
-					'text'	=> strval( $v )
+					'text'	=> strval($v)
 				);
 				
 			}
@@ -136,7 +136,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $r );
+		echo json_encode($r);
 		die();
 			
 	}
@@ -154,7 +154,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 	
 		// convert
 		$field['value'] = acf_get_array($field['value'], false);
@@ -162,15 +162,15 @@ 
 		
 		
 		// placeholder
-		if( empty($field['placeholder']) ) {
+		if (empty($field['placeholder'])) {
 		
-			$field['placeholder'] = __("Select",'acf');
+			$field['placeholder'] = __("Select", 'acf');
 			
 		}
 		
 		
 		// add empty value (allows '' to be selected)
-		if( !count($field['value']) ) {
+		if ( ! count($field['value'])) {
 			
 			$field['value'][''] = '';
 			
@@ -178,9 +178,9 @@ 
 		
 		
 		// null
-		if( $field['allow_null'] && !$field['multiple'] ) {
+		if ($field['allow_null'] && ! $field['multiple']) {
 			
-			$prepend = array(''	=> '- ' . $field['placeholder'] . ' -');
+			$prepend = array(''	=> '- '.$field['placeholder'].' -');
 			$field['choices'] = $prepend + $field['choices'];
 			
 		}
@@ -200,7 +200,7 @@ 
 		
 		
 		// multiple
-		if( $field['multiple'] ) {
+		if ($field['multiple']) {
 		
 			$atts['multiple'] = 'multiple';
 			$atts['size'] = 5;
@@ -210,19 +210,19 @@ 
 		
 		
 		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		foreach (array('readonly', 'disabled') as $k) {
 		
-			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
+			if ( ! empty($field[$k])) $atts[$k] = $k;
 			
 		}
 		
 		
 		// hidden input
-		if( $field['ui'] ) {
+		if ($field['ui']) {
 			
 			$v = $field['value'];
 			
-			if( $field['multiple'] ) {
+			if ($field['multiple']) {
 				
 				$v = implode('||', $v);
 				
@@ -233,15 +233,15 @@ 
 			}
 			
 			acf_hidden_input(array(
-				'id'	=> $field['id'] . '-input',
+				'id'	=> $field['id'].'-input',
 				'name'	=> $field['name'],
 				'value'	=> $v
 			));
 			
-		} elseif( $field['multiple'] ) {
+		} elseif ($field['multiple']) {
 			
 			acf_hidden_input(array(
-				'id'	=> $field['id'] . '-input',
+				'id'	=> $field['id'].'-input',
 				'name'	=> $field['name']
 			));
 			
@@ -250,11 +250,11 @@ 
 		
 		
 		// open
-		echo '<select ' . acf_esc_attr($atts) . '>';	
+		echo '<select '.acf_esc_attr($atts).'>';	
 		
 		
 		// walk
-		$this->walk( $field['choices'], $field['value'] );
+		$this->walk($field['choices'], $field['value']);
 		
 		
 		// close
@@ -276,24 +276,24 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function walk( $choices, $values ) {
+	function walk($choices, $values) {
 		
 		// bail ealry if no choices
-		if( empty($choices) ) return;
+		if (empty($choices)) return;
 		
 		
 		// loop
-		foreach( $choices as $k => $v ) {
+		foreach ($choices as $k => $v) {
 			
 			// optgroup
-			if( is_array($v) ){
+			if (is_array($v)) {
 				
 				// optgroup
-				echo '<optgroup label="' . esc_attr($k) . '">';
+				echo '<optgroup label="'.esc_attr($k).'">';
 				
 				
 				// walk
-				$this->walk( $v, $values );
+				$this->walk($v, $values);
 				
 				
 				// close optgroup
@@ -309,11 +309,11 @@ 
 			// vars
 			$search = html_entity_decode($k);
 			$pos = array_search($search, $values);
-			$atts = array( 'value' => $k );
+			$atts = array('value' => $k);
 			
 			
 			// validate selected
-			if( $pos !== false ) {
+			if ($pos !== false) {
 				
 				$atts['selected'] = 'selected';
 				$atts['data-i'] = $pos;
@@ -322,7 +322,7 @@ 
 			
 			
 			// option
-			echo '<option ' . acf_esc_attr($atts) . '>' . $v . '</option>';
+			echo '<option '.acf_esc_attr($atts).'>'.$v.'</option>';
 			
 		}
 		
@@ -342,7 +342,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// encode choices (convert from array)
 		$field['choices'] = acf_encode_choices($field['choices']);
@@ -350,74 +350,74 @@ 
 		
 		
 		// choices
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Choices','acf'),
-			'instructions'	=> __('Enter each choice on a new line.','acf') . '<br /><br />' . __('For more control, you may specify both a value and label like this:','acf'). '<br /><br />' . __('red : Red','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Choices', 'acf'),
+			'instructions'	=> __('Enter each choice on a new line.', 'acf').'<br /><br />'.__('For more control, you may specify both a value and label like this:', 'acf').'<br /><br />'.__('red : Red', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'choices',
 		));	
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Enter each default value on a new line','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Enter each default value on a new line', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// multiple
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Select multiple values?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Select multiple values?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'multiple',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// ui
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Stylised UI','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Stylised UI', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'ui',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 				
 		
 		// ajax
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Use AJAX to lazy load choices?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Use AJAX to lazy load choices?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'ajax',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -440,10 +440,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// ACF4 null
-		if( $value === 'null' ) return false;
+		if ($value === 'null') return false;
 		
 		
 		// return
@@ -466,7 +466,7 @@ 
 	*  @return	$field - the modified field
 	*/
 
-	function update_field( $field ) {
+	function update_field($field) {
 		
 		// decode choices (convert to array)
 		$field['choices'] = acf_decode_choices($field['choices']);
@@ -494,10 +494,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// validate
-		if( empty($value) ) {
+		if (empty($value)) {
 		
 			return $value;
 			
@@ -505,7 +505,7 @@ 
 		
 		
 		// array
-		if( is_array($value) ) {
+		if (is_array($value)) {
 			
 			// save value as strings, so we can clearly search for them in SQL LIKE statements
 			$value = array_map('strval', $value);
@@ -561,15 +561,15 @@ 
 */
 		
 		// scripts
-		wp_enqueue_script('select2', acf_get_dir("assets/inc/select2/select2{$min}.js"), array('jquery'), $version, true );
+		wp_enqueue_script('select2', acf_get_dir("assets/inc/select2/select2{$min}.js"), array('jquery'), $version, true);
 		
 		
 		// styles
-		wp_enqueue_style('select2', acf_get_dir('assets/inc/select2/select2.css'), '', $version );
+		wp_enqueue_style('select2', acf_get_dir('assets/inc/select2/select2.css'), '', $version);
 		
 		
 		// bail early if no language
-		if( !$lang ) return;
+		if ( ! $lang) return;
 		
 		
 		// vars
@@ -579,11 +579,11 @@ 
 		
 		
 		// attempt 1
-		if( file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang_code}.js")) ) {
+		if (file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang_code}.js"))) {
 			
 			$src = acf_get_dir("assets/inc/select2/select2_locale_{$lang_code}.js");
 			
-		} elseif( file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang}.js")) ) {
+		} elseif (file_exists(acf_get_path("assets/inc/select2/select2_locale_{$lang}.js"))) {
 			
 			$src = acf_get_dir("assets/inc/select2/select2_locale_{$lang}.js");
 			
@@ -591,11 +591,11 @@ 
 		
 		
 		// bail early if no language
-		if( !$src ) return;
+		if ( ! $src) return;
 		
 		
 		// scripts
-		wp_enqueue_script('select2-l10n', $src, '', $version, true );
+		wp_enqueue_script('select2-l10n', $src, '', $version, true);
 		
 	}