rousnay / lighthouse

includes/acf/core/third_party.php

Spacing +16 added lines, -16 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Core
 */
 
-if( ! class_exists('acf_third_party') ) :
+if ( ! class_exists('acf_third_party')) :
 
 class acf_third_party {
 	
@@ -56,11 +56,11 @@ 
 	function admin_head_tabify() {
 		
 		// remove ACF from the tabs
-		add_filter('tabify_posttypes',			array($this, 'tabify_posttypes'));
+		add_filter('tabify_posttypes', array($this, 'tabify_posttypes'));
 		
 		
 		// add acf metaboxes to list
-		add_action('tabify_add_meta_boxes',		array($this, 'tabify_add_meta_boxes'));
+		add_action('tabify_add_meta_boxes', array($this, 'tabify_add_meta_boxes'));
 		
 	}
 	
@@ -78,11 +78,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function tabify_posttypes( $posttypes ) {
+	function tabify_posttypes($posttypes) {
 		
 		// unset
-		unset( $posttypes['acf-field-group'] );
-		unset( $posttypes['acf-field'] );
+		unset($posttypes['acf-field-group']);
+		unset($posttypes['acf-field']);
 		
 		
 		// return
@@ -103,24 +103,24 @@ 
 	*  @return	n/a
 	*/
 	
-	function tabify_add_meta_boxes( $post_type ) {
+	function tabify_add_meta_boxes($post_type) {
 		
 		// get field groups
 		$field_groups = acf_get_field_groups();
 		
 		
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
 				// vars
 				$id = "acf-{$field_group['key']}";
-				$title = 'ACF: ' . $field_group['title'];
+				$title = 'ACF: '.$field_group['title'];
 
 				
 				
 				// add meta box
-				add_meta_box( $id, $title, '__return_true', $post_type );
+				add_meta_box($id, $title, '__return_true', $post_type);
 				
 			}
 			
@@ -142,26 +142,26 @@ 
 	*  @return	$pages
 	*/
 	
-	function pts_allowed_pages( $pages ) {
+	function pts_allowed_pages($pages) {
 		
 		// vars
 		$post_type = '';
 		
 		
 		// check $_GET becuase it is too early to use functions / global vars
-		if( !empty($_GET['post_type']) ) {
+		if ( ! empty($_GET['post_type'])) {
 			
 			$post_type = $_GET['post_type'];
 			
-		} elseif( !empty($_GET['post']) ) {
+		} elseif ( ! empty($_GET['post'])) {
 			
-			$post_type = get_post_type( $_GET['post'] );
+			$post_type = get_post_type($_GET['post']);
 			
 		}
 				
 		
 		// check post type
-		if( $post_type == 'acf-field-group' ) {
+		if ($post_type == 'acf-field-group') {
 			
 			$pages = array();
 			

includes/acf/core/wpml.php

Spacing +46 added lines, -46 removed lines

@@ -34,13 +34,13 @@ 
 		
 		
 		// actions
-		add_action('acf/verify_ajax',					array($this, 'verify_ajax'));
-		add_action('acf/field_group/admin_head',		array($this, 'admin_head'));
-		add_action('acf/input/admin_head',				array($this, 'admin_head'));
+		add_action('acf/verify_ajax', array($this, 'verify_ajax'));
+		add_action('acf/field_group/admin_head', array($this, 'admin_head'));
+		add_action('acf/input/admin_head', array($this, 'admin_head'));
 		
 		
 		// bail early if not transaltable
-		if( !$this->is_translatable() ) {
+		if ( ! $this->is_translatable()) {
 			
 			return;
 			
@@ -48,15 +48,15 @@ 
 		
 		
 		// actions
-		add_action('acf/upgrade_start/5.0.0',			array($this, 'upgrade_start_5'));
-		add_action('acf/upgrade_finish/5.0.0',			array($this, 'upgrade_finish_5'));
-		add_action('acf/update_field_group',			array($this, 'update_field_group'), 2, 1);
-		add_action('icl_make_duplicate',				array($this, 'icl_make_duplicate'), 10, 4);
+		add_action('acf/upgrade_start/5.0.0', array($this, 'upgrade_start_5'));
+		add_action('acf/upgrade_finish/5.0.0', array($this, 'upgrade_finish_5'));
+		add_action('acf/update_field_group', array($this, 'update_field_group'), 2, 1);
+		add_action('icl_make_duplicate', array($this, 'icl_make_duplicate'), 10, 4);
 		
 		
 		// filters
-		add_filter('acf/settings/save_json',			array($this, 'settings_save_json'));
-		add_filter('acf/settings/load_json',			array($this, 'settings_load_json'));
+		add_filter('acf/settings/save_json', array($this, 'settings_save_json'));
+		add_filter('acf/settings/load_json', array($this, 'settings_load_json'));
 		
 	}
 	
@@ -85,7 +85,7 @@ 
 		
 		
 		// return true if acf-field-group is translatable
-		if( !empty($post_types['acf-field-group']) ) {
+		if ( ! empty($post_types['acf-field-group'])) {
 			
 			return true;
 			
@@ -93,7 +93,7 @@ 
 		
 		
 		// return true if acf is translatable, and acf-field-group does not yet exist
-		if( !empty($post_types['acf']) && !isset($post_types['acf-field-group']) ) {
+		if ( ! empty($post_types['acf']) && ! isset($post_types['acf-field-group'])) {
 			
 			return true;
 			
@@ -135,7 +135,7 @@ 
 		
 		
 		// post type has changed from 'acf' to 'acf-field-group'
-		if( !empty($post_types['acf']) ) {
+		if ( ! empty($post_types['acf'])) {
 			
 			$post_types['acf-field-group'] = 1;
 			
@@ -147,7 +147,7 @@ 
 		
 		
 		// save
-		$sitepress->save_settings( $icl_settings );
+		$sitepress->save_settings($icl_settings);
 		
 	}
 	
@@ -186,14 +186,14 @@ 
 	*  @return	n/a
 	*/
 	
-	function update_field_group_5( $field_group ) {
+	function update_field_group_5($field_group) {
 		
 		// global
 		global $wpdb, $sitepress;
 		
 		
 		// bail early if no old_ID (added to $field_group by upgrade 5.0.0)
-		if( empty($field_group['old_ID']) ) {
+		if (empty($field_group['old_ID'])) {
 			
 			return;
 			
@@ -213,7 +213,7 @@ 
 		
 		
 		// bail ealry if no rows
-		if( !$old_row || !$new_row ) {
+		if ( ! $old_row || ! $new_row) {
 			
 			return;
 			
@@ -222,7 +222,7 @@ 
 		
 		// create reference of old trid to new trid
 		// trid is a simple int used to find associated objects
-		if( empty($this->trid_ref) ) {
+		if (empty($this->trid_ref)) {
 			
 			$this->trid_ref = array();
 			
@@ -230,15 +230,15 @@ 
 		
 		
 		// update trid
-		if( isset($this->trid_ref[ $old_row['trid'] ]) ) {
+		if (isset($this->trid_ref[$old_row['trid']])) {
 			
 			// this field group is a translation of another, update it's trid to match the previously inserted group
-			$new_row['trid'] = $this->trid_ref[ $old_row['trid'] ];
+			$new_row['trid'] = $this->trid_ref[$old_row['trid']];
 			
 		} else {
 			
 			// this field group is the first of it's translations, update the reference for future groups
-			$this->trid_ref[ $old_row['trid'] ] = $new_row['trid'];
+			$this->trid_ref[$old_row['trid']] = $new_row['trid'];
 			
 		}
 		
@@ -246,14 +246,14 @@ 
 		// update icl_translations
 		// Row is created by WPML, and much easier to tweak it here due to the very complicated and nonsensical WPML logic
 		$table = "{$wpdb->prefix}icl_translations";
-		$data = array( 'trid' => $new_row['trid'], 'language_code' => $old_row['language_code'] );
-		$where = array( 'translation_id' => $new_row['translation_id'] );
-		$data_format = array( '%d', '%s' );
-		$where_format = array( '%d' );
+		$data = array('trid' => $new_row['trid'], 'language_code' => $old_row['language_code']);
+		$where = array('translation_id' => $new_row['translation_id']);
+		$data_format = array('%d', '%s');
+		$where_format = array('%d');
 		
 		
 		// allow source_language_code to equal NULL
-		if( $old_row['source_language_code'] ) {
+		if ($old_row['source_language_code']) {
 			
 			$data['source_language_code'] = $old_row['source_language_code'];
 			$data_format[] = '%s';
@@ -262,7 +262,7 @@ 
 		
 		
 		// update wpdb
-		$result = $wpdb->update( $table, $data, $where, $data_format, $where_format );
+		$result = $wpdb->update($table, $data, $where, $data_format, $where_format);
 		
 	}
 	
@@ -280,7 +280,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function update_field_group( $field_group ) {
+	function update_field_group($field_group) {
 		
 		global $sitepress;
 		
@@ -302,10 +302,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function settings_save_json( $path ) {	
+	function settings_save_json($path) {	
 		
 		// bail early if dir does not exist
-		if( !is_writable($path) ) {
+		if ( ! is_writable($path)) {
 			
 			return $path;
 			
@@ -313,15 +313,15 @@ 
 		
 		
 		// remove trailing slash
-		$path = untrailingslashit( $path );
+		$path = untrailingslashit($path);
 
 			
 		// ammend
-		$path = $path . '/' . $this->lang;
+		$path = $path.'/'.$this->lang;
 		
 		
 		// make dir if does not exist
-		if( !file_exists($path) ) {
+		if ( ! file_exists($path)) {
 			
 			mkdir($path, 0777, true);
 			
@@ -347,18 +347,18 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function settings_load_json( $paths ) {
+	function settings_load_json($paths) {
 		
-		if( !empty($paths) ) {
+		if ( ! empty($paths)) {
 			
-			foreach( $paths as $i => $path ) {
+			foreach ($paths as $i => $path) {
 				
 				// remove trailing slash
-				$path = untrailingslashit( $path );
+				$path = untrailingslashit($path);
 				
 				
 				// ammend
-				$paths[ $i ] = $path . '/' . $this->lang;
+				$paths[$i] = $path.'/'.$this->lang;
 			
 			}
 		}
@@ -384,10 +384,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function icl_make_duplicate( $master_post_id, $lang, $postarr, $id ) {
+	function icl_make_duplicate($master_post_id, $lang, $postarr, $id) {
 		
 		// validate
-		if( $postarr['post_type'] != 'acf-field-group' ) {
+		if ($postarr['post_type'] != 'acf-field-group') {
 		
 			return;
 			
@@ -395,7 +395,7 @@ 
 		
 		
 		// duplicate field group
-		acf_duplicate_field_group( $master_post_id, $id );
+		acf_duplicate_field_group($master_post_id, $id);
 		
 		
 		// always translate independately to avoid many many bugs!
@@ -403,7 +403,7 @@ 
 		// - local json creates new files due to changed key
 		global $iclTranslationManagement;
 		
-		$iclTranslationManagement->reset_duplicate_flag( $id );
+		$iclTranslationManagement->reset_duplicate_flag($id);
 
 	}
 	
@@ -464,18 +464,18 @@ 
 		
 		
 		// switch lang
-		if( isset($_REQUEST['lang']) ) {
+		if (isset($_REQUEST['lang'])) {
 			
-			$sitepress->switch_lang( $_REQUEST['lang'] );
+			$sitepress->switch_lang($_REQUEST['lang']);
 			
 		}
 		
 		
 		// remove post_id
 		// WPML is getting confused when this is not a numeric value ('options')
-		if( isset($_REQUEST['post_id']) && !is_numeric($_REQUEST['post_id']) ) {
+		if (isset($_REQUEST['post_id']) && ! is_numeric($_REQUEST['post_id'])) {
 			
-			unset( $_REQUEST['post_id'] );
+			unset($_REQUEST['post_id']);
 				
 		}
 		

includes/acf/fields/checkbox.php

Indentation +1 added lines, -1 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_checkbox') ) :
+if ( ! class_exists('acf_field_checkbox')) :
 
 class acf_field_checkbox extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'checkbox';
-		$this->label = __("Checkbox",'acf');
+		$this->label = __("Checkbox", 'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
 			'layout'		=> 'vertical',
@@ -63,7 +63,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// decode value (convert to array)
 		$field['value'] = acf_get_array($field['value'], false);
@@ -87,9 +87,9 @@ 
 		
 		
 		// foreach choices
-		if( !empty($field['choices']) ) {
+		if ( ! empty($field['choices'])) {
 			
-			foreach( $field['choices'] as $value => $label ) {
+			foreach ($field['choices'] as $value => $label) {
 				
 				// increase counter
 				$i++;
@@ -105,7 +105,7 @@ 
 				
 				
 				// is choice selected?
-				if( in_array($value, $field['value']) ) {
+				if (in_array($value, $field['value'])) {
 					
 					$atts['checked'] = 'checked';
 					
@@ -116,7 +116,7 @@ 
 				}
 				
 				
-				if( isset($field['disabled']) && acf_in_array($value, $field['disabled']) ) {
+				if (isset($field['disabled']) && acf_in_array($value, $field['disabled'])) {
 				
 					$atts['disabled'] = 'disabled';
 					
@@ -124,21 +124,21 @@ 
 				
 				
 				// 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;
 					
 				}
 				
 				
 				// append HTML
-				$li .= '<li><label><input ' . acf_esc_attr( $atts ) . '/>' . $label . '</label></li>';
+				$li .= '<li><label><input '.acf_esc_attr($atts).'/>'.$label.'</label></li>';
 				
 			}
 			
 			
 			// toggle all
-			if( $field['toggle'] ) {
+			if ($field['toggle']) {
 				
 				// vars
 				$label = __("Toggle All", 'acf');
@@ -149,7 +149,7 @@ 
 				
 				
 				// custom label
-				if( is_string($field['toggle']) ) {
+				if (is_string($field['toggle'])) {
 					
 					$label = $field['toggle'];
 					
@@ -157,7 +157,7 @@ 
 				
 				
 				// checked
-				if( $all_checked ) {
+				if ($all_checked) {
 					
 					$atts['checked'] = 'checked';
 					
@@ -165,7 +165,7 @@ 
 				
 				
 				// append HTML
-				$li = '<li><label><input ' . acf_esc_attr( $atts ) . '/>' . $label . '</label></li>' . $li;
+				$li = '<li><label><input '.acf_esc_attr($atts).'/>'.$label.'</label></li>'.$li;
 					
 			}
 		
@@ -178,7 +178,7 @@ 
 
 		
 		// return
-		echo '<ul ' . acf_esc_attr(array( 'class' => $field['class'] )) . '>' . $li . '</ul>';
+		echo '<ul '.acf_esc_attr(array('class' => $field['class'])).'>'.$li.'</ul>';
 		
 	}
 	
@@ -196,7 +196,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']);
@@ -204,47 +204,47 @@ 
 				
 		
 		// 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',
 		));
 		
 		
 		// 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')
 			)
 		));
 		
 		
 		// layout
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Toggle','acf'),
-			'instructions'	=> __('Prepend an extra checkbox to toggle all choices','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Toggle', 'acf'),
+			'instructions'	=> __('Prepend an extra checkbox to toggle all choices', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'toggle',
 			'layout'		=> 'horizontal', 
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			)
 		));
 		
@@ -267,7 +267,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']);
@@ -295,10 +295,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;
 			
@@ -306,7 +306,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);

includes/acf/fields/color_picker.php

Indentation +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
     	
 	}
 	
@@ -79,19 +79,19 @@ 
 			
 			
 			// localize
-		    wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
-		        'clear'			=> __('Clear', 'acf' ),
-		        'defaultString'	=> __('Default', 'acf' ),
-		        'pick'			=> __('Select Color', 'acf' ),
-		        'current'		=> __('Current Color', 'acf' )
-		    )); 
+			wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
+				'clear'			=> __('Clear', 'acf' ),
+				'defaultString'	=> __('Default', 'acf' ),
+				'pick'			=> __('Select Color', 'acf' ),
+				'current'		=> __('Current Color', 'acf' )
+			)); 
 			
 		}
 		
 		
 		// enqueue
 		wp_enqueue_style('wp-color-picker');
-	    wp_enqueue_script('wp-color-picker');
+		wp_enqueue_script('wp-color-picker');
 	    
 	    			
 	}

Spacing +14 added lines, -14 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_color_picker') ) :
+if ( ! class_exists('acf_field_color_picker')) :
 
 class acf_field_color_picker extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'color_picker';
-		$this->label = __("Color Picker",'acf');
+		$this->label = __("Color Picker", 'acf');
 		$this->category = 'jquery';
 		$this->defaults = array(
 			'default_value'	=> '',
@@ -67,7 +67,7 @@ 
 		
 		// register if not already (on front end)
 		// http://wordpress.stackexchange.com/questions/82718/how-do-i-implement-the-wordpress-iris-picker-into-my-plugin-on-the-front-end
-		if( !isset($wp_scripts->registered['iris']) ) {
+		if ( ! isset($wp_scripts->registered['iris'])) {
 			
 			// styles
 			wp_register_style('wp-color-picker', admin_url('css/color-picker.css'), array(), '', true);
@@ -80,10 +80,10 @@ 
 			
 			// localize
 		    wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
-		        'clear'			=> __('Clear', 'acf' ),
-		        'defaultString'	=> __('Default', 'acf' ),
-		        'pick'			=> __('Select Color', 'acf' ),
-		        'current'		=> __('Current Color', 'acf' )
+		        'clear'			=> __('Clear', 'acf'),
+		        'defaultString'	=> __('Default', 'acf'),
+		        'pick'			=> __('Select Color', 'acf'),
+		        'current'		=> __('Current Color', 'acf')
 		    )); 
 			
 		}
@@ -109,7 +109,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$atts = array();
@@ -117,16 +117,16 @@ 
 		
 		
 		// populate atts
-		foreach( array( 'id', 'class', 'name', 'value' ) as $k ) {
+		foreach (array('id', 'class', 'name', 'value') as $k) {
 		
-			$atts[ $k ] = $field[ $k ];
+			$atts[$k] = $field[$k];
 			
 		}
 		
 		
 		// render
 		$e .= '<div class="acf-color_picker">';
-		$e .= '<input type="text" ' . acf_esc_attr($atts) . ' />';
+		$e .= '<input type="text" '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -148,11 +148,11 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// display_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'text',
 			'name'			=> 'default_value',

includes/acf/fields/date_picker.php

Indentation +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
 	}
 	
 	
@@ -70,14 +70,14 @@ 
 		
 		$this->l10n = array(
 			'closeText'         => __( 'Done', 'acf' ),
-	        'currentText'       => __( 'Today', 'acf' ),
-	        'monthNames'        => array_values( $wp_locale->month ),
-	        'monthNamesShort'   => array_values( $wp_locale->month_abbrev ),
-	        'monthStatus'       => __( 'Show a different month', 'acf' ),
-	        'dayNames'          => array_values( $wp_locale->weekday ),
-	        'dayNamesShort'     => array_values( $wp_locale->weekday_abbrev ),
-	        'dayNamesMin'       => array_values( $wp_locale->weekday_initial ),
-	        'isRTL'             => isset($wp_locale->is_rtl) ? $wp_locale->is_rtl : false,
+			'currentText'       => __( 'Today', 'acf' ),
+			'monthNames'        => array_values( $wp_locale->month ),
+			'monthNamesShort'   => array_values( $wp_locale->month_abbrev ),
+			'monthStatus'       => __( 'Show a different month', 'acf' ),
+			'dayNames'          => array_values( $wp_locale->weekday ),
+			'dayNamesShort'     => array_values( $wp_locale->weekday_abbrev ),
+			'dayNamesMin'       => array_values( $wp_locale->weekday_initial ),
+			'isRTL'             => isset($wp_locale->is_rtl) ? $wp_locale->is_rtl : false,
 		);
 		
 	}

Spacing +28 added lines, -28 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_date_picker') ) :
+if ( ! class_exists('acf_field_date_picker')) :
 
 class acf_field_date_picker extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'date_picker';
-		$this->label = __("Date Picker",'acf');
+		$this->label = __("Date Picker", 'acf');
 		$this->category = 'jquery';
 		$this->defaults = array(
 			'display_format'	=> 'd/m/Y',
@@ -69,14 +69,14 @@ 
 		global $wp_locale;
 		
 		$this->l10n = array(
-			'closeText'         => __( 'Done', 'acf' ),
-	        'currentText'       => __( 'Today', 'acf' ),
-	        'monthNames'        => array_values( $wp_locale->month ),
-	        'monthNamesShort'   => array_values( $wp_locale->month_abbrev ),
-	        'monthStatus'       => __( 'Show a different month', 'acf' ),
-	        'dayNames'          => array_values( $wp_locale->weekday ),
-	        'dayNamesShort'     => array_values( $wp_locale->weekday_abbrev ),
-	        'dayNamesMin'       => array_values( $wp_locale->weekday_initial ),
+			'closeText'         => __('Done', 'acf'),
+	        'currentText'       => __('Today', 'acf'),
+	        'monthNames'        => array_values($wp_locale->month),
+	        'monthNamesShort'   => array_values($wp_locale->month_abbrev),
+	        'monthStatus'       => __('Show a different month', 'acf'),
+	        'dayNames'          => array_values($wp_locale->weekday),
+	        'dayNamesShort'     => array_values($wp_locale->weekday_abbrev),
+	        'dayNamesMin'       => array_values($wp_locale->weekday_initial),
 	        'isRTL'             => isset($wp_locale->is_rtl) ? $wp_locale->is_rtl : false,
 		);
 		
@@ -103,7 +103,7 @@ 
 		
 		
 		// style
-		wp_enqueue_style('acf-datepicker', acf_get_dir('assets/inc/datepicker/jquery-ui-1.10.4.custom.min.css'), '', '1.10.4' );
+		wp_enqueue_style('acf-datepicker', acf_get_dir('assets/inc/datepicker/jquery-ui-1.10.4.custom.min.css'), '', '1.10.4');
 		
 	}
 	
@@ -120,7 +120,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$e = '';
@@ -139,8 +139,8 @@ 
 			
 
 		// html
-		$e .= '<div ' . acf_esc_attr($div) . '>';
-			$e .= '<input ' . acf_esc_attr($input). '/>';
+		$e .= '<div '.acf_esc_attr($div).'>';
+			$e .= '<input '.acf_esc_attr($input).'/>';
 			$e .= '<input type="text" value="" class="input" />';
 		$e .= '</div>';
 		
@@ -163,16 +163,16 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// global
 		global $wp_locale;
 		
 		
 		// display_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Display format','acf'),
-			'instructions'	=> __('The format displayed when editing a post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Display format', 'acf'),
+			'instructions'	=> __('The format displayed when editing a post', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'display_format',
 			'other_choice'	=> 1,
@@ -185,9 +185,9 @@ 
 				
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return format','acf'),
-			'instructions'	=> __('The format returned via template functions','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return format', 'acf'),
+			'instructions'	=> __('The format returned via template functions', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'other_choice'	=> 1,
@@ -201,12 +201,12 @@ 
 		
 		
 		// first_day
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Week Starts On','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Week Starts On', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'first_day',
-			'choices'		=> array_values( $wp_locale->weekday )
+			'choices'		=> array_values($wp_locale->weekday)
 		));
 		
 	}
@@ -228,10 +228,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;
 		
@@ -239,11 +239,11 @@ 
 		
 		
 		// get time
-		$unixtimestamp = strtotime( $value );
+		$unixtimestamp = strtotime($value);
  
 		
 		// bail early if timestamp is not correct
-		if( !$unixtimestamp ) {
+		if ( ! $unixtimestamp) {
 			
 			return $value;
 			

includes/acf/fields/email.php

Indentation +1 added lines, -1 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_email') ) :
+if ( ! class_exists('acf_field_email')) :
 
 class acf_field_email extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'email';
-		$this->label = __("Email",'acf');
+		$this->label = __("Email", 'acf');
 		$this->defaults = array(
 			'default_value'	=> '',
 			'placeholder'	=> '',
@@ -59,43 +59,43 @@ 
 	*  @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];	
 			
 		}
 		
 		
 		// render
 		$e .= '<div class="acf-input-wrap">';
-		$e .= '<input ' . acf_esc_attr( $atts ) . ' />';
+		$e .= '<input '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -117,39 +117,39 @@ 
 	*  @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',
 		));

includes/acf/fields/file.php

Indentation +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
     	
 	}
 	
@@ -340,8 +340,8 @@ 
 	
 	function get_media_item_args( $vars ) {
 	
-	    $vars['send'] = true;
-	    return($vars);
+		$vars['send'] = true;
+		return($vars);
 	    
 	}
 	   	

Spacing +57 added lines, -57 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_file') ) :
+if ( ! class_exists('acf_field_file')) :
 
 class acf_field_file extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'file';
-		$this->label = __("File",'acf');
+		$this->label = __("File", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'return_format'	=> 'array',
@@ -43,16 +43,16 @@ 
 			'mime_types'	=> ''
 		);
 		$this->l10n = array(
-			'select'		=> __("Select File",'acf'),
-			'edit'			=> __("Edit File",'acf'),
-			'update'		=> __("Update File",'acf'),
-			'uploadedTo'	=> __("uploaded to this post",'acf'),
+			'select'		=> __("Select File", 'acf'),
+			'edit'			=> __("Edit File", 'acf'),
+			'update'		=> __("Update File", 'acf'),
+			'uploadedTo'	=> __("uploaded to this post", 'acf'),
 		);
 		
 		
 		// filters
-		add_filter('get_media_item_args',			array($this, 'get_media_item_args'));
-		add_filter('wp_prepare_attachment_for_js',	array($this, 'wp_prepare_attachment_for_js'), 10, 3);
+		add_filter('get_media_item_args', array($this, 'get_media_item_args'));
+		add_filter('wp_prepare_attachment_for_js', array($this, 'wp_prepare_attachment_for_js'), 10, 3);
 		
 		
 		// do not delete!
@@ -73,14 +73,14 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$uploader = acf_get_setting('uploader');
 		
 		
 		// enqueue
-		if( $uploader == 'wp' ) {
+		if ($uploader == 'wp') {
 			
 			acf_enqueue_uploader();
 			
@@ -105,21 +105,21 @@ 
 		
 		
 		// has value
-		if( $field['value'] && is_numeric($field['value']) ) {
+		if ($field['value'] && is_numeric($field['value'])) {
 			
-			$file = get_post( $field['value'] );
+			$file = get_post($field['value']);
 			
-			if( $file ) {
+			if ($file) {
 				
 				$div['class'] .= ' has-value';
 				
-				$o['icon'] = wp_mime_type_icon( $file->ID );
-				$o['title']	= $file->post_title;
-				$o['size'] = @size_format(filesize( get_attached_file( $file->ID ) ));
-				$o['url'] = wp_get_attachment_url( $file->ID );
+				$o['icon'] = wp_mime_type_icon($file->ID);
+				$o['title'] = $file->post_title;
+				$o['size'] = @size_format(filesize(get_attached_file($file->ID)));
+				$o['url'] = wp_get_attachment_url($file->ID);
 				
 				$explode = explode('/', $o['url']);
-				$o['name'] = end( $explode );	
+				$o['name'] = end($explode);	
 							
 			}
 			
@@ -128,7 +128,7 @@ 
 ?>
 <div <?php acf_esc_attr_e($div); ?>>
 	<div class="acf-hidden">
-		<?php acf_hidden_input(array( 'name' => $field['name'], 'value' => $field['value'], 'data-name' => 'id' )); ?>
+		<?php acf_hidden_input(array('name' => $field['name'], 'value' => $field['value'], 'data-name' => 'id')); ?>
 	</div>
 	<div class="show-if-value file-wrap acf-soh">
 		<div class="file-icon">
@@ -148,7 +148,7 @@ 
 			</p>
 			
 			<ul class="acf-hl acf-soh-target">
-				<?php if( $uploader != 'basic' ): ?>
+				<?php if ($uploader != 'basic'): ?>
 					<li><a class="acf-icon -pencil dark" data-name="edit" href="#"></a></li>
 				<?php endif; ?>
 				<li><a class="acf-icon -cancel dark" data-name="remove" href="#"></a></li>
@@ -156,9 +156,9 @@ 
 		</div>
 	</div>
 	<div class="hide-if-value">
-		<?php if( $uploader == 'basic' ): ?>
+		<?php if ($uploader == 'basic'): ?>
 			
-			<?php if( $field['value'] && !is_numeric($field['value']) ): ?>
+			<?php if ($field['value'] && ! is_numeric($field['value'])): ?>
 				<div class="acf-error-message"><p><?php echo $field['value']; ?></p></div>
 			<?php endif; ?>
 			
@@ -166,7 +166,7 @@ 
 			
 		<?php else: ?>
 			
-			<p style="margin:0;"><?php _e('No File selected','acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add File','acf'); ?></a></p>
+			<p style="margin:0;"><?php _e('No File selected', 'acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add File', 'acf'); ?></a></p>
 			
 		<?php endif; ?>
 		
@@ -190,7 +190,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// clear numeric settings
 		$clear = array(
@@ -198,9 +198,9 @@ 
 			'max_size'
 		);
 		
-		foreach( $clear as $k ) {
+		foreach ($clear as $k) {
 			
-			if( empty($field[$k]) ) {
+			if (empty($field[$k])) {
 				
 				$field[$k] = '';
 				
@@ -210,24 +210,24 @@ 
 		
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return Value','acf'),
-			'instructions'	=> __('Specify the returned value on front end','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return Value', 'acf'),
+			'instructions'	=> __('Specify the returned value on front end', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'layout'		=> 'horizontal',
 			'choices'		=> array(
-				'array'			=> __("File Array",'acf'),
-				'url'			=> __("File URL",'acf'),
-				'id'			=> __("File ID",'acf')
+				'array'			=> __("File Array", 'acf'),
+				'url'			=> __("File URL", 'acf'),
+				'id'			=> __("File ID", 'acf')
 			)
 		));
 		
 		
 		// library
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Library','acf'),
-			'instructions'	=> __('Limit the media library choice','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Library', 'acf'),
+			'instructions'	=> __('Limit the media library choice', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'library',
 			'layout'		=> 'horizontal',
@@ -239,9 +239,9 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum','acf'),
-			'instructions'	=> __('Restrict which files can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum', 'acf'),
+			'instructions'	=> __('Restrict which files can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'min_size',
 			'prepend'		=> __('File size', 'acf'),
@@ -250,9 +250,9 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum','acf'),
-			'instructions'	=> __('Restrict which files can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum', 'acf'),
+			'instructions'	=> __('Restrict which files can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'max_size',
 			'prepend'		=> __('File size', 'acf'),
@@ -261,9 +261,9 @@ 
 		
 		
 		// allowed type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allowed file types','acf'),
-			'instructions'	=> __('Comma separated list. Leave blank for all types','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allowed file types', 'acf'),
+			'instructions'	=> __('Comma separated list. Leave blank for all types', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'mime_types',
 		));
@@ -287,10 +287,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 false;
 			
@@ -298,7 +298,7 @@ 
 		
 		
 		// bail early if not numeric (error message)
-		if( !is_numeric($value) ) {
+		if ( ! is_numeric($value)) {
 			
 			return false;
 				
@@ -310,13 +310,13 @@ 
 		
 		
 		// format
-		if( $field['return_format'] == 'url' ) {
+		if ($field['return_format'] == 'url') {
 		
 			return wp_get_attachment_url($value);
 			
-		} elseif( $field['return_format'] == 'array' ) {
+		} elseif ($field['return_format'] == 'array') {
 			
-			return acf_get_attachment( $value );
+			return acf_get_attachment($value);
 		}
 		
 		
@@ -338,7 +338,7 @@ 
 	*  @return	$vars
 	*/
 	
-	function get_media_item_args( $vars ) {
+	function get_media_item_args($vars) {
 	
 	    $vars['send'] = true;
 	    return($vars);
@@ -362,10 +362,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// array?
-		if( is_array($value) && isset($value['ID']) ) {
+		if (is_array($value) && isset($value['ID'])) {
 		
 			return $value['ID'];	
 			
@@ -373,7 +373,7 @@ 
 		
 		
 		// object?
-		if( is_object($value) && isset($value->ID) ) {
+		if (is_object($value) && isset($value->ID)) {
 		
 			return $value->ID;
 			
@@ -397,16 +397,16 @@ 
 	*  @return	{int}	$post_id
 	*/
 	
-	function wp_prepare_attachment_for_js( $response, $attachment, $meta ) {
+	function wp_prepare_attachment_for_js($response, $attachment, $meta) {
 		
 		// default
 		$fs = '0 kb';
 		
 		
 		// supress PHP warnings caused by corrupt images
-		if( $i = @filesize( get_attached_file( $attachment->ID ) ) ) {
+		if ($i = @filesize(get_attached_file($attachment->ID))) {
 		
-			$fs = size_format( $i );
+			$fs = size_format($i);
 			
 		}
 		

Braces +5 added lines, -2 removed lines

@@ -164,9 +164,12 @@
 			
 			<input type="file" name="<?php echo $field['name']; ?>" id="<?php echo $field['id']; ?>" />
 			
-		<?php else: ?>
+		<?php else {
+	: ?>
 			
-			<p style="margin:0;"><?php _e('No File selected','acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add File','acf'); ?></a></p>
+			<p style="margin:0;"><?php _e('No File selected','acf');
+}
+?> <a data-name="add" class="acf-button" href="#"><?php _e('Add File','acf'); ?></a></p>
 			
 		<?php endif; ?>
 		

includes/acf/fields/google-map.php

Indentation +1 added lines, -1 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_google_map') ) :
+if ( ! class_exists('acf_field_google_map')) :
 
 class acf_field_google_map extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'google_map';
-		$this->label = __("Google Map",'acf');
+		$this->label = __("Google Map", 'acf');
 		$this->category = 'jquery';
 		$this->defaults = array(
 			'height'		=> '',
@@ -48,8 +48,8 @@ 
 			'zoom'			=> '14'
 		);
 		$this->l10n = array(
-			'locating'			=> __("Locating",'acf'),
-			'browser_support'	=> __("Sorry, this browser does not support geolocation",'acf'),
+			'locating'			=> __("Locating", 'acf'),
+			'browser_support'	=> __("Sorry, this browser does not support geolocation", 'acf'),
 		);
 		
 		
@@ -70,10 +70,10 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// validate value
-		if( empty($field['value']) ) {
+		if (empty($field['value'])) {
 			
 			$field['value'] = array();
 			
@@ -89,11 +89,11 @@ 
 		
 		
 		// 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;
 				
 			}
 				
@@ -104,7 +104,7 @@ 
 		$atts = array(
 			'id'			=> $field['id'],
 			'class'			=> "acf-google-map {$field['class']}",
-			'data-id'		=> $field['id'] . '-' . uniqid(), 
+			'data-id'		=> $field['id'].'-'.uniqid(), 
 			'data-lat'		=> $field['center_lat'],
 			'data-lng'		=> $field['center_lng'],
 			'data-zoom'		=> $field['zoom'],
@@ -112,7 +112,7 @@ 
 		
 		
 		// has value
-		if( $field['value']['address'] ) {
+		if ($field['value']['address']) {
 		
 			$atts['class'] .= ' -value';
 			
@@ -122,8 +122,8 @@ 
 <div <?php acf_esc_attr_e($atts); ?>>
 	
 	<div class="acf-hidden">
-		<?php foreach( $field['value'] as $k => $v ): ?>
-			<input type="hidden" class="input-<?php echo $k; ?>" name="<?php echo esc_attr($field['name']); ?>[<?php echo $k; ?>]" value="<?php echo esc_attr( $v ); ?>" />
+		<?php foreach ($field['value'] as $k => $v): ?>
+			<input type="hidden" class="input-<?php echo $k; ?>" name="<?php echo esc_attr($field['name']); ?>[<?php echo $k; ?>]" value="<?php echo esc_attr($v); ?>" />
 		<?php endforeach; ?>
 	</div>
 	
@@ -135,7 +135,7 @@ 
 			<a href="#" data-name="locate" class="acf-icon -location grey" title="<?php _e("Find current location", 'acf'); ?>"></a>
 		</div>
 		
-		<input class="search" type="text" placeholder="<?php _e("Search for address...",'acf'); ?>" value="<?php echo $field['value']['address']; ?>" />
+		<input class="search" type="text" placeholder="<?php _e("Search for address...", 'acf'); ?>" value="<?php echo $field['value']['address']; ?>" />
 		<i class="acf-loading"></i>
 				
 	</div>
@@ -161,12 +161,12 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// center_lat
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Center','acf'),
-			'instructions'	=> __('Center the initial map','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Center', 'acf'),
+			'instructions'	=> __('Center the initial map', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'center_lat',
 			'prepend'		=> 'lat',
@@ -175,9 +175,9 @@ 
 		
 		
 		// center_lng
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Center','acf'),
-			'instructions'	=> __('Center the initial map','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Center', 'acf'),
+			'instructions'	=> __('Center the initial map', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'center_lng',
 			'prepend'		=> 'lng',
@@ -189,9 +189,9 @@ 
 		
 		
 		// zoom
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Zoom','acf'),
-			'instructions'	=> __('Set the initial zoom level','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Zoom', 'acf'),
+			'instructions'	=> __('Set the initial zoom level', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'zoom',
 			'placeholder'	=> $this->default_values['zoom']
@@ -199,9 +199,9 @@ 
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Height','acf'),
-			'instructions'	=> __('Customise the map height','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Height', 'acf'),
+			'instructions'	=> __('Customise the map height', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'height',
 			'append'		=> 'px',
@@ -224,17 +224,17 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// bail early if not required
-		if( ! $field['required'] ) {
+		if ( ! $field['required']) {
 			
 			return $valid;
 			
 		}
 		
 		
-		if( empty($value) || empty($value['lat']) || empty($value['lng']) ) {
+		if (empty($value) || empty($value['lat']) || empty($value['lng'])) {
 			
 			return false;
 			
@@ -263,9 +263,9 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 	
-		if( empty($value) || empty($value['lat']) || empty($value['lng']) ) {
+		if (empty($value) || empty($value['lat']) || empty($value['lng'])) {
 			
 			return false;
 			

includes/acf/fields/image.php

Indentation +4 added lines, -4 removed lines

@@ -62,9 +62,9 @@ 
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
     
-    }
+	}
     
 	
 	/*
@@ -377,8 +377,8 @@ 
 	
 	function get_media_item_args( $vars ) {
 	
-	    $vars['send'] = true;
-	    return($vars);
+		$vars['send'] = true;
+		return($vars);
 	    
 	}
 	

Spacing +67 added lines, -67 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_image') ) :
+if ( ! class_exists('acf_field_image')) :
 
 class acf_field_image extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'image';
-		$this->label = __("Image",'acf');
+		$this->label = __("Image", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'return_format'	=> 'array',
@@ -48,17 +48,17 @@ 
 			'mime_types'	=> ''
 		);
 		$this->l10n = array(
-			'select'		=> __("Select Image",'acf'),
-			'edit'			=> __("Edit Image",'acf'),
-			'update'		=> __("Update Image",'acf'),
-			'uploadedTo'	=> __("Uploaded to this post",'acf'),
-			'all'			=> __("All images",'acf'),
+			'select'		=> __("Select Image", 'acf'),
+			'edit'			=> __("Edit Image", 'acf'),
+			'update'		=> __("Update Image", 'acf'),
+			'uploadedTo'	=> __("Uploaded to this post", 'acf'),
+			'all'			=> __("All images", 'acf'),
 		);
 		
 		
 		// filters
-		add_filter('get_media_item_args',				array($this, 'get_media_item_args'));
-		add_filter('wp_prepare_attachment_for_js',		array($this, 'wp_prepare_attachment_for_js'), 10, 3);
+		add_filter('get_media_item_args', array($this, 'get_media_item_args'));
+		add_filter('wp_prepare_attachment_for_js', array($this, 'wp_prepare_attachment_for_js'), 10, 3);
 		
 		
 		// do not delete!
@@ -79,14 +79,14 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$uploader = acf_get_setting('uploader');
 		
 		
 		// enqueue
-		if( $uploader == 'wp' ) {
+		if ($uploader == 'wp') {
 			
 			acf_enqueue_uploader();
 			
@@ -105,11 +105,11 @@ 
 		
 		
 		// has value?
-		if( $field['value'] && is_numeric($field['value']) ) {
+		if ($field['value'] && is_numeric($field['value'])) {
 			
 			$url = wp_get_attachment_image_src($field['value'], $field['preview_size']);
 			
-			if( $url ) {
+			if ($url) {
 				
 				$url = $url[0];
 			
@@ -120,23 +120,23 @@ 
 		}
 		
 ?>
-<div <?php acf_esc_attr_e( $div ); ?>>
+<div <?php acf_esc_attr_e($div); ?>>
 	<div class="acf-hidden">
-		<?php acf_hidden_input(array( 'name' => $field['name'], 'value' => $field['value'], 'data-name' => 'id' )); ?>
+		<?php acf_hidden_input(array('name' => $field['name'], 'value' => $field['value'], 'data-name' => 'id')); ?>
 	</div>
 	<div class="view show-if-value acf-soh">
 		<img data-name="image" src="<?php echo $url; ?>" alt=""/>
 		<ul class="acf-hl acf-soh-target">
-			<?php if( $uploader != 'basic' ): ?>
+			<?php if ($uploader != 'basic'): ?>
 				<li><a class="acf-icon -pencil dark" data-name="edit" href="#"></a></li>
 			<?php endif; ?>
 			<li><a class="acf-icon -cancel dark" data-name="remove" href="#"></a></li>
 		</ul>
 	</div>
 	<div class="view hide-if-value">
-		<?php if( $uploader == 'basic' ): ?>
+		<?php if ($uploader == 'basic'): ?>
 			
-			<?php if( $field['value'] && !is_numeric($field['value']) ): ?>
+			<?php if ($field['value'] && ! is_numeric($field['value'])): ?>
 				<div class="acf-error-message"><p><?php echo $field['value']; ?></p></div>
 			<?php endif; ?>
 			
@@ -144,7 +144,7 @@ 
 			
 		<?php else: ?>
 			
-			<p style="margin:0;"><?php _e('No image selected','acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add Image','acf'); ?></a></p>
+			<p style="margin:0;"><?php _e('No image selected', 'acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add Image', 'acf'); ?></a></p>
 			
 		<?php endif; ?>
 	</div>
@@ -167,7 +167,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// clear numeric settings
 		$clear = array(
@@ -179,9 +179,9 @@ 
 			'max_size'
 		);
 		
-		foreach( $clear as $k ) {
+		foreach ($clear as $k) {
 			
-			if( empty($field[$k]) ) {
+			if (empty($field[$k])) {
 				
 				$field[$k] = '';
 				
@@ -191,24 +191,24 @@ 
 		
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return Value','acf'),
-			'instructions'	=> __('Specify the returned value on front end','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return Value', 'acf'),
+			'instructions'	=> __('Specify the returned value on front end', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'layout'		=> 'horizontal',
 			'choices'		=> array(
-				'array'			=> __("Image Array",'acf'),
-				'url'			=> __("Image URL",'acf'),
-				'id'			=> __("Image ID",'acf')
+				'array'			=> __("Image Array", 'acf'),
+				'url'			=> __("Image URL", 'acf'),
+				'id'			=> __("Image ID", 'acf')
 			)
 		));
 		
 		
 		// preview_size
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Preview Size','acf'),
-			'instructions'	=> __('Shown when entering data','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Preview Size', 'acf'),
+			'instructions'	=> __('Shown when entering data', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'preview_size',
 			'choices'		=> acf_get_image_sizes()
@@ -216,9 +216,9 @@ 
 		
 		
 		// library
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Library','acf'),
-			'instructions'	=> __('Limit the media library choice','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Library', 'acf'),
+			'instructions'	=> __('Limit the media library choice', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'library',
 			'layout'		=> 'horizontal',
@@ -230,16 +230,16 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum','acf'),
-			'instructions'	=> __('Restrict which images can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum', 'acf'),
+			'instructions'	=> __('Restrict which images can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'min_width',
 			'prepend'		=> __('Width', 'acf'),
 			'append'		=> 'px',
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'min_height',
@@ -250,7 +250,7 @@ 
 			)
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'min_size',
@@ -263,16 +263,16 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum','acf'),
-			'instructions'	=> __('Restrict which images can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum', 'acf'),
+			'instructions'	=> __('Restrict which images can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'max_width',
 			'prepend'		=> __('Width', 'acf'),
 			'append'		=> 'px',
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'max_height',
@@ -283,7 +283,7 @@ 
 			)
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'max_size',
@@ -296,9 +296,9 @@ 
 		
 		
 		// allowed type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allowed file types','acf'),
-			'instructions'	=> __('Comma separated list. Leave blank for all types','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allowed file types', 'acf'),
+			'instructions'	=> __('Comma separated list. Leave blank for all types', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'mime_types',
 		));
@@ -322,10 +322,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 false;
 			
@@ -333,7 +333,7 @@ 
 		
 		
 		// bail early if not numeric (error message)
-		if( !is_numeric($value) ) {
+		if ( ! is_numeric($value)) {
 			
 			return false;
 				
@@ -345,13 +345,13 @@ 
 		
 		
 		// format
-		if( $field['return_format'] == 'url' ) {
+		if ($field['return_format'] == 'url') {
 		
-			return wp_get_attachment_url( $value );
+			return wp_get_attachment_url($value);
 			
-		} elseif( $field['return_format'] == 'array' ) {
+		} elseif ($field['return_format'] == 'array') {
 			
-			return acf_get_attachment( $value );
+			return acf_get_attachment($value);
 			
 		}
 		
@@ -375,7 +375,7 @@ 
 	*  @return	$vars
 	*/
 	
-	function get_media_item_args( $vars ) {
+	function get_media_item_args($vars) {
 	
 	    $vars['send'] = true;
 	    return($vars);
@@ -431,10 +431,10 @@ 
 	*  @return	{int}	$post_id
 	*/
 	
-	function wp_prepare_attachment_for_js( $response, $attachment, $meta ) {
+	function wp_prepare_attachment_for_js($response, $attachment, $meta) {
 		
 		// only for image
-		if( $response['type'] != 'image' ) {
+		if ($response['type'] != 'image') {
 		
 			return $response;
 			
@@ -442,7 +442,7 @@ 
 		
 		
 		// make sure sizes exist. Perhaps they dont?
-		if( !isset($meta['sizes']) ) {
+		if ( ! isset($meta['sizes'])) {
 		
 			return $response;
 			
@@ -450,18 +450,18 @@ 
 		
 		
 		$attachment_url = $response['url'];
-		$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+		$base_url = str_replace(wp_basename($attachment_url), '', $attachment_url);
 		
-		if( isset($meta['sizes']) && is_array($meta['sizes']) ) {
+		if (isset($meta['sizes']) && is_array($meta['sizes'])) {
 		
-			foreach( $meta['sizes'] as $k => $v ) {
+			foreach ($meta['sizes'] as $k => $v) {
 			
-				if( !isset($response['sizes'][ $k ]) ) {
+				if ( ! isset($response['sizes'][$k])) {
 				
-					$response['sizes'][ $k ] = array(
+					$response['sizes'][$k] = array(
 						'height'      => $v['height'],
 						'width'       => $v['width'],
-						'url'         => $base_url .  $v['file'],
+						'url'         => $base_url.$v['file'],
 						'orientation' => $v['height'] > $v['width'] ? 'portrait' : 'landscape',
 					);
 				}
@@ -490,10 +490,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// array?
-		if( is_array($value) && isset($value['ID']) ) {
+		if (is_array($value) && isset($value['ID'])) {
 		
 			return $value['ID'];	
 			
@@ -501,7 +501,7 @@ 
 		
 		
 		// object?
-		if( is_object($value) && isset($value->ID) ) {
+		if (is_object($value) && isset($value->ID)) {
 		
 			return $value->ID;
 			

Braces +5 added lines, -2 removed lines

@@ -142,9 +142,12 @@
 			
 			<input type="file" name="<?php echo $field['name']; ?>" id="<?php echo $field['id']; ?>" />
 			
-		<?php else: ?>
+		<?php else {
+	: ?>
 			
-			<p style="margin:0;"><?php _e('No image selected','acf'); ?> <a data-name="add" class="acf-button" href="#"><?php _e('Add Image','acf'); ?></a></p>
+			<p style="margin:0;"><?php _e('No image selected','acf');
+}
+?> <a data-name="add" class="acf-button" href="#"><?php _e('Add Image','acf'); ?></a></p>
 			
 		<?php endif; ?>
 	</div>