rousnay / lighthouse

includes/acf/forms/taxonomy.php

Indentation +2 added lines, -2 removed lines

@@ -395,8 +395,8 @@
 		
 		
 	    
-	    // save data
-	    if( acf_validate_save_post(true) ) {
+		// save data
+		if( acf_validate_save_post(true) ) {
 	    
 			acf_save_post("{$taxonomy}_{$term_id}");
 		

Spacing +29 added lines, -29 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_taxonomy') ) :
+if ( ! class_exists('acf_form_taxonomy')) :
 
 class acf_form_taxonomy {
 	
@@ -33,16 +33,16 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',	array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// save
-		add_action('create_term',			array($this, 'save_term'), 10, 3);
-		add_action('edit_term',				array($this, 'save_term'), 10, 3);
+		add_action('create_term', array($this, 'save_term'), 10, 3);
+		add_action('edit_term', array($this, 'save_term'), 10, 3);
 		
 		
 		// delete
-		add_action('delete_term',			array($this, 'delete_term'), 10, 4);
+		add_action('delete_term', array($this, 'delete_term'), 10, 4);
 		
 	}
 	
@@ -67,7 +67,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow == 'edit-tags.php' ) {
+		if ($pagenow == 'edit-tags.php') {
 			
 			return true;
 			
@@ -96,7 +96,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( !$this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 			
 			return;
 			
@@ -113,9 +113,9 @@ 
 		
 		
 		// actions
-		add_action('admin_footer',					array($this, 'admin_footer'), 10, 1);
-		add_action("{$taxonomy}_add_form_fields", 	array($this, 'add_term'), 10, 1);
-		add_action("{$taxonomy}_edit_form", 		array($this, 'edit_term'), 10, 2);
+		add_action('admin_footer', array($this, 'admin_footer'), 10, 1);
+		add_action("{$taxonomy}_add_form_fields", array($this, 'add_term'), 10, 1);
+		add_action("{$taxonomy}_edit_form", array($this, 'edit_term'), 10, 2);
 		
 	}
 	
@@ -133,7 +133,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function add_term( $taxonomy ) {
+	function add_term($taxonomy) {
 		
 		// vars
 		$post_id = "{$taxonomy}_0";
@@ -147,22 +147,22 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			acf_form_data(array( 
 				'post_id'	=> $post_id, 
 				'nonce'		=> 'taxonomy',
 			));
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 
-				acf_render_fields( $post_id, $fields, 'div', 'field' );
+				acf_render_fields($post_id, $fields, 'div', 'field');
 				
 			}
 			
@@ -184,7 +184,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_term( $term, $taxonomy ) {
+	function edit_term($term, $taxonomy) {
 		
 		// vars
 		$post_id = "{$taxonomy}_{$term->term_id}";
@@ -198,28 +198,28 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			acf_form_data(array( 
 				'post_id'	=> $post_id, 
 				'nonce'		=> 'taxonomy' 
 			));
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				?>
-				<?php if( $field_group['style'] == 'default' ): ?>
+				<?php if ($field_group['style'] == 'default'): ?>
 					<h3><?php echo $field_group['title']; ?></h3>
 				<?php endif; ?>
 				<table class="form-table">
 					<tbody>
-						<?php acf_render_fields( $post_id, $fields, 'tr', 'field' ); ?>
+						<?php acf_render_fields($post_id, $fields, 'tr', 'field'); ?>
 					</tbody>
 				</table>
 				<?php 
@@ -271,7 +271,7 @@ 
 	acf.validation.error_class = 'form-invalid';
 		
 		
-<?php if( $this->form == '#addtag' ): ?>
+<?php if ($this->form == '#addtag'): ?>
 
 	// store origional HTML
 	var $orig = $('#addtag').children('.acf-field').clone();
@@ -384,10 +384,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_term( $term_id, $tt_id, $taxonomy ) {
+	function save_term($term_id, $tt_id, $taxonomy) {
 		
 		// verify and remove nonce
-		if( ! acf_verify_nonce('taxonomy') ) {
+		if ( ! acf_verify_nonce('taxonomy')) {
 			
 			return $term_id;
 		
@@ -396,7 +396,7 @@ 
 		
 	    
 	    // save data
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
 			acf_save_post("{$taxonomy}_{$term_id}");
 		
@@ -418,13 +418,13 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
+	function delete_term($term, $tt_id, $taxonomy, $deleted_term) {
 		
 		global $wpdb;
 		
 		$values = $wpdb->query($wpdb->prepare(
 			"DELETE FROM $wpdb->options WHERE option_name LIKE %s",
-			'%' . $taxonomy . '_' . $term . '%'
+			'%'.$taxonomy.'_'.$term.'%'
 		));
 		
 	}

includes/acf/forms/widget.php

Indentation +4 added lines, -4 removed lines

@@ -181,8 +181,8 @@ 
 		$id = acf_maybe_get($_POST, 'widget-id');
 		
 	    
-	    // save data
-	    if( $id && acf_validate_save_post() ) {
+		// save data
+		if( $id && acf_validate_save_post() ) {
 	    	
 			acf_save_post( "widget_{$id}" );		
 		
@@ -218,8 +218,8 @@ 
 		}
 		
 		
-	    // save
-	    if( acf_validate_save_post() ) {
+		// save
+		if( acf_validate_save_post() ) {
 	    	
 			acf_save_post( "widget_{$widget->id}" );		
 		

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_widget') ) :
+if ( ! class_exists('acf_form_widget')) :
 
 class acf_form_widget {
 	
@@ -31,16 +31,16 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',		array($this, 'admin_enqueue_scripts'));
-		add_action('in_widget_form', 			array($this, 'edit_widget'), 10, 3);
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
+		add_action('in_widget_form', array($this, 'edit_widget'), 10, 3);
 		
 		
 		// filters
-		add_filter('widget_update_callback', 	array($this, 'widget_update_callback'), 10, 4);
+		add_filter('widget_update_callback', array($this, 'widget_update_callback'), 10, 4);
 		
 		
 		// ajax
-		add_action('wp_ajax_update-widget', 	array($this, 'ajax_update_widget'), 0, 1);
+		add_action('wp_ajax_update-widget', array($this, 'ajax_update_widget'), 0, 1);
 		
 	}
 	
@@ -62,7 +62,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate screen
-		if( acf_is_screen('widgets') || acf_is_screen('customize') ) {
+		if (acf_is_screen('widgets') || acf_is_screen('customize')) {
 		
 			// valid
 			
@@ -97,14 +97,14 @@ 
 	*  @param	$instance (object)
 	*  @return	$post_id (int)
 	*/
-	function edit_widget( $widget, $return, $instance ) {
+	function edit_widget($widget, $return, $instance) {
 		
 		// vars
 		$post_id = 0;
 		
 		
 		// get id
-		if( $widget->number !== '__i__' ) {
+		if ($widget->number !== '__i__') {
 		
 			$post_id = "widget_{$widget->id}";
 			
@@ -118,7 +118,7 @@ 
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// render post data
 			acf_form_data(array( 
@@ -127,15 +127,15 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
-				acf_render_fields( $post_id, $fields, 'div', 'field' );
+				acf_render_fields($post_id, $fields, 'div', 'field');
 				
 			}
 			
-			if( $widget->updated ): ?>
+			if ($widget->updated): ?>
 			<script type="text/javascript">
 			(function($) {
 				
@@ -170,7 +170,7 @@ 
 		
 		
 		// bail early if no nonce
-		if( !acf_verify_nonce('widget') ) {
+		if ( ! acf_verify_nonce('widget')) {
 		
 			return;
 			
@@ -182,9 +182,9 @@ 
 		
 	    
 	    // save data
-	    if( $id && acf_validate_save_post() ) {
+	    if ($id && acf_validate_save_post()) {
 	    	
-			acf_save_post( "widget_{$id}" );		
+			acf_save_post("widget_{$id}");		
 		
 		}
 		
@@ -208,10 +208,10 @@ 
 	*  @return	$instance
 	*/
 	
-	function widget_update_callback( $instance, $new_instance, $old_instance, $widget ) {
+	function widget_update_callback($instance, $new_instance, $old_instance, $widget) {
 		
 		// bail early if no nonce
-		if( !acf_verify_nonce('widget') ) {
+		if ( ! acf_verify_nonce('widget')) {
 		
 			return $instance;
 			
@@ -219,9 +219,9 @@ 
 		
 		
 	    // save
-	    if( acf_validate_save_post() ) {
+	    if (acf_validate_save_post()) {
 	    	
-			acf_save_post( "widget_{$widget->id}" );		
+			acf_save_post("widget_{$widget->id}");		
 		
 		}
 		
@@ -349,7 +349,7 @@ 
 		
 	});
 	
-	<?php if( acf_is_screen('customize') ): ?>
+	<?php if (acf_is_screen('customize')): ?>
 	
 	// customizer saves widget on any input change, so unload is not needed
 	acf.unload.active = 0;

includes/acf/pro/acf-pro.php

Spacing +46 added lines, -46 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
 
-if( !class_exists('acf_pro') ):
+if ( ! class_exists('acf_pro')):
 
 class acf_pro {
 	
@@ -20,8 +20,8 @@ 
 	function __construct() {
 		
 		// update setting
-		acf_update_setting( 'pro', true );
-		acf_update_setting( 'name', __('Advanced Custom Fields PRO', 'acf') );
+		acf_update_setting('pro', true);
+		acf_update_setting('name', __('Advanced Custom Fields PRO', 'acf'));
 		
 
 		// api
@@ -34,7 +34,7 @@ 
 			
 			
 		// admin
-		if( is_admin() ) {
+		if (is_admin()) {
 			
 			// options page
 			acf_include('pro/admin/options-page.php');
@@ -46,17 +46,17 @@ 
 		
 		
 		// actions
-		add_action('init',										array($this, 'register_assets'));
-		add_action('acf/include_field_types',					array($this, 'include_field_types'), 5);
-		add_action('acf/input/admin_enqueue_scripts',			array($this, 'input_admin_enqueue_scripts'));
-		add_action('acf/field_group/admin_enqueue_scripts',		array($this, 'field_group_admin_enqueue_scripts'));
-		add_action('acf/field_group/admin_l10n',				array($this, 'field_group_admin_l10n'));
+		add_action('init', array($this, 'register_assets'));
+		add_action('acf/include_field_types', array($this, 'include_field_types'), 5);
+		add_action('acf/input/admin_enqueue_scripts', array($this, 'input_admin_enqueue_scripts'));
+		add_action('acf/field_group/admin_enqueue_scripts', array($this, 'field_group_admin_enqueue_scripts'));
+		add_action('acf/field_group/admin_l10n', array($this, 'field_group_admin_l10n'));
 		
 		
 		// filters
-		add_filter('acf/get_valid_field',						array($this, 'get_valid_field'), 11, 1);
-		add_filter('acf/prepare_field_for_export', 				array($this, 'prepare_field_for_export'));
-		add_filter('acf/prepare_field_for_import', 				array($this, 'prepare_field_for_import'));
+		add_filter('acf/get_valid_field', array($this, 'get_valid_field'), 11, 1);
+		add_filter('acf/prepare_field_for_export', array($this, 'prepare_field_for_export'));
+		add_filter('acf/prepare_field_for_import', array($this, 'prepare_field_for_import'));
 		
 	}
 	
@@ -96,14 +96,14 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_field( $field ) {
+	function get_valid_field($field) {
 		
 		// extract old width
-		$width = acf_extract_var( $field, 'column_width' );
+		$width = acf_extract_var($field, 'column_width');
 		
 		
 		// if old width, update the new width
-		if( $width ) {
+		if ($width) {
 			
 			$field['wrapper']['width'] = $width;
 		}
@@ -131,17 +131,17 @@ 
 	function register_assets() {
 		
 		// min
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 		
 		
 		// register scripts
-		wp_register_script( 'acf-pro-input', acf_get_dir( "pro/assets/js/acf-pro-input{$min}.js" ), false, acf_get_setting('version') );
-		wp_register_script( 'acf-pro-field-group', acf_get_dir( "pro/assets/js/acf-pro-field-group{$min}.js" ), false, acf_get_setting('version') );
+		wp_register_script('acf-pro-input', acf_get_dir("pro/assets/js/acf-pro-input{$min}.js"), false, acf_get_setting('version'));
+		wp_register_script('acf-pro-field-group', acf_get_dir("pro/assets/js/acf-pro-field-group{$min}.js"), false, acf_get_setting('version'));
 		
 		
 		// register styles
-		wp_register_style( 'acf-pro-input', acf_get_dir( 'pro/assets/css/acf-pro-input.css' ), false, acf_get_setting('version') ); 
-		wp_register_style( 'acf-pro-field-group', acf_get_dir( 'pro/assets/css/acf-pro-field-group.css' ), false, acf_get_setting('version') ); 
+		wp_register_style('acf-pro-input', acf_get_dir('pro/assets/css/acf-pro-input.css'), false, acf_get_setting('version')); 
+		wp_register_style('acf-pro-field-group', acf_get_dir('pro/assets/css/acf-pro-field-group.css'), false, acf_get_setting('version')); 
 		
 	}
 	
@@ -184,11 +184,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function field_group_admin_l10n( $l10n ) {
+	function field_group_admin_l10n($l10n) {
 		
 		// append
 		$l10n['flexible_content'] = array(
-			'layout_warning' => __('Flexible Content requires at least 1 layout','acf')
+			'layout_warning' => __('Flexible Content requires at least 1 layout', 'acf')
 		);
 		
 		
@@ -236,23 +236,23 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function prepare_field_for_export( $field ) {
+	function prepare_field_for_export($field) {
 		
 		// sub field (parent_layout)
-		acf_extract_var( $field, 'parent_layout');
+		acf_extract_var($field, 'parent_layout');
 		
 		
 		// repeater
-		if( $field['type'] == 'repeater' ) {
+		if ($field['type'] == 'repeater') {
 			
-			$field['sub_fields'] = acf_prepare_fields_for_export( $field['sub_fields'] );
+			$field['sub_fields'] = acf_prepare_fields_for_export($field['sub_fields']);
 		
 		// flexible content
-		} elseif( $field['type'] == 'flexible_content' ) {
+		} elseif ($field['type'] == 'flexible_content') {
 			
-			foreach( $field['layouts'] as $l => $layout ) {
+			foreach ($field['layouts'] as $l => $layout) {
 				
-				$field['layouts'][ $l ]['sub_fields'] = acf_prepare_fields_for_export( $layout['sub_fields'] );
+				$field['layouts'][$l]['sub_fields'] = acf_prepare_fields_for_export($layout['sub_fields']);
 			
 			}
 
@@ -278,29 +278,29 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function prepare_field_for_import( $field ) {
+	function prepare_field_for_import($field) {
 		
 		// var
 		$extra = array();
 		
 		
 		// sub fields
-		if( $field['type'] == 'repeater' ) {
+		if ($field['type'] == 'repeater') {
 			
 			// extract sub fields
-			$sub_fields = acf_extract_var( $field, 'sub_fields');
+			$sub_fields = acf_extract_var($field, 'sub_fields');
 			
 			
 			// reset field setting
 			$field['sub_fields'] = array();
 			
 			
-			if( !empty($sub_fields) ) {
+			if ( ! empty($sub_fields)) {
 			
-				foreach( array_keys($sub_fields) as $i ) {
+				foreach (array_keys($sub_fields) as $i) {
 					
 					// extract sub field
-					$sub_field = acf_extract_var( $sub_fields, $i );
+					$sub_field = acf_extract_var($sub_fields, $i);
 							
 					
 					// attributes
@@ -314,10 +314,10 @@ 
 				
 			}
 			
-		} elseif( $field['type'] == 'flexible_content' ) {
+		} elseif ($field['type'] == 'flexible_content') {
 			
 			// extract layouts
-			$layouts = acf_extract_var( $field, 'layouts');
+			$layouts = acf_extract_var($field, 'layouts');
 			
 			
 			// reset field setting
@@ -325,17 +325,17 @@ 
 			
 			
 			// validate layouts
-			if( !empty($layouts) ) {
+			if ( ! empty($layouts)) {
 				
 				// loop over layouts
-				foreach( array_keys($layouts) as $i ) {
+				foreach (array_keys($layouts) as $i) {
 					
 					// extract layout
-					$layout = acf_extract_var( $layouts, $i );
+					$layout = acf_extract_var($layouts, $i);
 					
 					
 					// get valid layout (fixes ACF4 export code bug undefined index 'key')
-					if( empty($layout['key']) ) {
+					if (empty($layout['key'])) {
 						
 						$layout['key'] = uniqid();
 						
@@ -343,17 +343,17 @@ 
 					
 					
 					// extract sub fields
-					$sub_fields = acf_extract_var( $layout, 'sub_fields');
+					$sub_fields = acf_extract_var($layout, 'sub_fields');
 					
 					
 					// validate sub fields
-					if( !empty($sub_fields) ) {
+					if ( ! empty($sub_fields)) {
 						
 						// loop over sub fields
-						foreach( array_keys($sub_fields) as $j ) {
+						foreach (array_keys($sub_fields) as $j) {
 							
 							// extract sub field
-							$sub_field = acf_extract_var( $sub_fields, $j );
+							$sub_field = acf_extract_var($sub_fields, $j);
 							
 							
 							// attributes
@@ -380,7 +380,7 @@ 
 		
 		
 		// extra
-		if( !empty($extra) ) {
+		if ( ! empty($extra)) {
 			
 			array_unshift($extra, $field);
 			

includes/acf/pro/admin/options-page.php

Indentation +16 added lines, -16 removed lines

@@ -45,9 +45,9 @@ 
 	
 	function rule_types( $choices ) {
 		
-	    $choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
+		$choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
 		
-	    return $choices;
+		return $choices;
 	}
 	
 	
@@ -86,7 +86,7 @@ 
 		
 		
 		// return
-	    return $choices;
+		return $choices;
 	}
 	
 	
@@ -129,19 +129,19 @@ 
 		// match
 		if( $rule['operator'] == "==" ) {
 		
-        	$match = ( $options_page === $rule['value'] );
+			$match = ( $options_page === $rule['value'] );
         	
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         
-        	$match = ( $options_page !== $rule['value'] );
+			$match = ( $options_page !== $rule['value'] );
         	
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
 	
 	/*
@@ -216,17 +216,17 @@ 
 		if( acf_verify_nonce('options') ) {
 		
 			// save data
-		    if( acf_validate_save_post(true) ) {
+			if( acf_validate_save_post(true) ) {
 		    	
-		    	// get post_id (allow lang modification)
-		    	$post_id = acf_get_valid_post_id($this->page['post_id']);
+				// get post_id (allow lang modification)
+				$post_id = acf_get_valid_post_id($this->page['post_id']);
 		    	
 		    	
-		    	// set autoload
-		    	acf_update_setting('autoload', $this->page['autoload']);
+				// set autoload
+				acf_update_setting('autoload', $this->page['autoload']);
 		    	
 		    	
-		    	// save
+				// save
 				acf_save_post( $post_id );
 				
 				

Spacing +44 added lines, -44 removed lines

@@ -21,13 +21,13 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_menu', array($this,'admin_menu'), 99, 0);
+		add_action('admin_menu', array($this, 'admin_menu'), 99, 0);
 		
 		
 		// filters
-		add_filter( 'acf/location/rule_types', 					array($this, 'rule_types'), 10, 1 );
-		add_filter( 'acf/location/rule_values/options_page',	array($this, 'rule_values'), 10, 1 );
-		add_filter( 'acf/location/rule_match/options_page',		array($this, 'rule_match'), 10, 3 );
+		add_filter('acf/location/rule_types', array($this, 'rule_types'), 10, 1);
+		add_filter('acf/location/rule_values/options_page', array($this, 'rule_values'), 10, 1);
+		add_filter('acf/location/rule_match/options_page', array($this, 'rule_match'), 10, 3);
 	}
 		
 	
@@ -43,9 +43,9 @@ 
 	*  @return	{array}	$choices
 	*/
 	
-	function rule_types( $choices ) {
+	function rule_types($choices) {
 		
-	    $choices[ __("Forms",'acf') ]['options_page'] = __("Options Page",'acf');
+	    $choices[__("Forms", 'acf')]['options_page'] = __("Options Page", 'acf');
 		
 	    return $choices;
 	}
@@ -63,18 +63,18 @@ 
 	*  @return	{array}	$choices
 	*/
 	
-	function rule_values( $choices ) {
+	function rule_values($choices) {
 		
 		// vars
 		$pages = acf_get_options_pages();
 		
 		
 		// populate
-		if( !empty($pages) ) {
+		if ( ! empty($pages)) {
 		
-			foreach( $pages as $page ) {
+			foreach ($pages as $page) {
 			
-				$choices[ $page['menu_slug'] ] = $page['menu_title'];
+				$choices[$page['menu_slug']] = $page['menu_title'];
 				
 			}
 			
@@ -103,21 +103,21 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function rule_match( $match, $rule, $options ) {
+	function rule_match($match, $rule, $options) {
 		
 		// vars
 		$options_page = false;
 		
 		
 		// $options does not contain a default for "options_page"
-		if( isset($options['options_page']) ) {
+		if (isset($options['options_page'])) {
 		
 			$options_page = $options['options_page'];
 			
 		}
 		
 
-		if( !$options_page ) {
+		if ( ! $options_page) {
 		
 			global $plugin_page;
 			
@@ -127,13 +127,13 @@ 
 		
 		
 		// match
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 		
-        	$match = ( $options_page === $rule['value'] );
+        	$match = ($options_page === $rule['value']);
         	
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         
-        	$match = ( $options_page !== $rule['value'] );
+        	$match = ($options_page !== $rule['value']);
         	
         }
         
@@ -164,29 +164,29 @@ 
 		
 		
 		// create pages
-		if( !empty($pages) ) {
+		if ( ! empty($pages)) {
 		
-			foreach( $pages as $page ) {
+			foreach ($pages as $page) {
 				
 				// vars
 				$slug = '';
 				
 				
-				if( empty($page['parent_slug']) ) {
+				if (empty($page['parent_slug'])) {
 					
 					// add page
-					$slug = add_menu_page( $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'), $page['icon_url'], $page['position'] );
+					$slug = add_menu_page($page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'), $page['icon_url'], $page['position']);
 					
 				} else {
 					
 					// add page
-					$slug = add_submenu_page( $page['parent_slug'], $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html') );
+					$slug = add_submenu_page($page['parent_slug'], $page['page_title'], $page['menu_title'], $page['capability'], $page['menu_slug'], array($this, 'html'));
 					
 				}
 				
 				
 				// actions
-				add_action("load-{$slug}", array($this,'admin_load'));
+				add_action("load-{$slug}", array($this, 'admin_load'));
 			}
 			
 		}
@@ -213,10 +213,10 @@ 
 		    	
 		    	
 		// verify and remove nonce
-		if( acf_verify_nonce('options') ) {
+		if (acf_verify_nonce('options')) {
 		
 			// save data
-		    if( acf_validate_save_post(true) ) {
+		    if (acf_validate_save_post(true)) {
 		    	
 		    	// get post_id (allow lang modification)
 		    	$post_id = acf_get_valid_post_id($this->page['post_id']);
@@ -227,11 +227,11 @@ 
 		    	
 		    	
 		    	// save
-				acf_save_post( $post_id );
+				acf_save_post($post_id);
 				
 				
 				// redirect
-				wp_redirect( admin_url("admin.php?page={$plugin_page}&message=1") );
+				wp_redirect(admin_url("admin.php?page={$plugin_page}&message=1"));
 				exit;
 				
 			}
@@ -244,7 +244,7 @@ 
 		
 		
 		// actions
-		add_action( 'acf/input/admin_head',		array($this,'admin_head') );
+		add_action('acf/input/admin_head', array($this, 'admin_head'));
 	
 	}
 	
@@ -271,34 +271,34 @@ 
 		
 		
 		// notices
-		if( !empty($_GET['message']) && $_GET['message'] == '1' ) {
+		if ( ! empty($_GET['message']) && $_GET['message'] == '1') {
 		
-			acf_add_admin_notice( __("Options Updated",'acf') );
+			acf_add_admin_notice(__("Options Updated", 'acf'));
 			
 		}
 		
-		if( empty($field_groups) ) {
+		if (empty($field_groups)) {
 		
-			acf_add_admin_notice(__("No Custom Field Groups found for this options page",'acf') . '. <a href="' . admin_url() . 'post-new.php?post_type=acf-field-group">' . __("Create a Custom Field Group",'acf') . '</a>', 'error');
+			acf_add_admin_notice(__("No Custom Field Groups found for this options page", 'acf').'. <a href="'.admin_url().'post-new.php?post_type=acf-field-group">'.__("Create a Custom Field Group", 'acf').'</a>', 'error');
 		
 		} else {
 			
-			foreach( $field_groups as $i => $field_group ) {
+			foreach ($field_groups as $i => $field_group) {
 			
 				// vars
 				$id = "acf-{$field_group['key']}";
 				$title = $field_group['title'];
 				$context = $field_group['position'];
 				$priority = 'high';
-				$args = array( 'field_group' => $field_group );
+				$args = array('field_group' => $field_group);
 				
 				
 				// tweaks to vars
-				if( $context == 'acf_after_title' ) {
+				if ($context == 'acf_after_title') {
 					
 					$context = 'normal';
 					
-				} elseif( $context == 'side' ) {
+				} elseif ($context == 'side') {
 				
 					$priority = 'core';
 					
@@ -310,7 +310,7 @@ 
 				
 				
 				// add meta box
-				add_meta_box( $id, $title, array($this, 'render_meta_box'), 'acf_options_page', $context, $priority, $args );
+				add_meta_box($id, $title, array($this, 'render_meta_box'), 'acf_options_page', $context, $priority, $args);
 				
 				
 			}
@@ -335,11 +335,11 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function render_meta_box( $post, $args ) {
+	function render_meta_box($post, $args) {
 		
 		// extract args
-		extract( $args ); // all variables from the add_meta_box function
-		extract( $args ); // all variables from the args argument
+		extract($args); // all variables from the add_meta_box function
+		extract($args); // all variables from the args argument
 		
 		
 		// vars
@@ -360,19 +360,19 @@ 
 		
 		
 		// edit_url
-		if( $field_group['ID'] && acf_current_user_can_admin() ) {
+		if ($field_group['ID'] && acf_current_user_can_admin()) {
 			
-			$o['edit_url'] = admin_url('post.php?post=' . $field_group['ID'] . '&action=edit');
+			$o['edit_url'] = admin_url('post.php?post='.$field_group['ID'].'&action=edit');
 				
 		}
 		
 		
 		// load fields
-		$fields = acf_get_fields( $field_group );
+		$fields = acf_get_fields($field_group);
 		
 		
 		// render
-		acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] );
+		acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']);
 		
 		
 		

includes/acf/pro/admin/settings-updates.php

Indentation +50 added lines, -50 removed lines

@@ -132,77 +132,77 @@
 		
 		
 		// validate
-        if( empty($info) ) {
+		if( empty($info) ) {
         
-        	acf_add_admin_notice( __('<b>Error</b>. Could not connect to update server', 'acf'), 'error');
-        	return;
+			acf_add_admin_notice( __('<b>Error</b>. Could not connect to update server', 'acf'), 'error');
+			return;
         	
-        }
+		}
         
         
-        // add info to view
-        $this->view['remote_version'] = $info['version'];
+		// add info to view
+		$this->view['remote_version'] = $info['version'];
         
         
-        // add changelog if the remote version is '>' than the current version
+		// add changelog if the remote version is '>' than the current version
 		if( acf_pro_is_update_available() )
-        {
-        	$this->view['update_available'] = true;
+		{
+			$this->view['update_available'] = true;
         	 
         	 
-        	// changelog
-        	$changelogs = explode('<h4>', $info['changelog']);
+			// changelog
+			$changelogs = explode('<h4>', $info['changelog']);
         	
-        	foreach( $changelogs as $changelog )
-        	{
-        		// validate (first segment is always empty due to explode)
-	        	if( empty($changelog) )
-	        	{
-		        	continue;
-	        	}
+			foreach( $changelogs as $changelog )
+			{
+				// validate (first segment is always empty due to explode)
+				if( empty($changelog) )
+				{
+					continue;
+				}
 	        	
 	        	
-        	 	// explode
-	        	$changelog = explode('</h4>', $changelog);
-	        	$changelog_version = trim($changelog[0]);
-	        	$changelog_text = trim($changelog[1]);
-	        	$changelog_text = str_replace('<ul>', '<ul class="ul-disc">', $changelog_text);
+			 	// explode
+				$changelog = explode('</h4>', $changelog);
+				$changelog_version = trim($changelog[0]);
+				$changelog_text = trim($changelog[1]);
+				$changelog_text = str_replace('<ul>', '<ul class="ul-disc">', $changelog_text);
 	        	
-	        	if( version_compare($this->view['remote_version'], $changelog_version, '==') )
-	        	{
-		        	$this->view['changelog'] = $changelog_text;
-		        	break;
-	        	}
+				if( version_compare($this->view['remote_version'], $changelog_version, '==') )
+				{
+					$this->view['changelog'] = $changelog_text;
+					break;
+				}
 	        	
-        	}
+			}
         	 
         	 
-        	// upgrade_notice
-        	$upgrade_notices = explode('<h4>', $info['upgrade_notice']);
+			// upgrade_notice
+			$upgrade_notices = explode('<h4>', $info['upgrade_notice']);
         	
-        	foreach( $upgrade_notices as $upgrade_notice )
-        	{
-        		// validate (first segment is always empty due to explode)
-	        	if( empty($upgrade_notice) )
-	        	{
-		        	continue;
-	        	}
+			foreach( $upgrade_notices as $upgrade_notice )
+			{
+				// validate (first segment is always empty due to explode)
+				if( empty($upgrade_notice) )
+				{
+					continue;
+				}
 	        	
 	        	
-        	 	// explode
-	        	$upgrade_notice = explode('</h4>', $upgrade_notice);
-	        	$upgrade_version = trim($upgrade_notice[0]);
-	        	$upgrade_text = trim($upgrade_notice[1]);
-	        	$upgrade_text = str_replace('<ul>', '<ul class="ul-disc">', $upgrade_text);
+			 	// explode
+				$upgrade_notice = explode('</h4>', $upgrade_notice);
+				$upgrade_version = trim($upgrade_notice[0]);
+				$upgrade_text = trim($upgrade_notice[1]);
+				$upgrade_text = str_replace('<ul>', '<ul class="ul-disc">', $upgrade_text);
 	        	
-	        	if( version_compare($this->view['current_version'], $upgrade_version, '<') )
-	        	{
-		        	$this->view['upgrade_notice'] = $upgrade_text;
-		        	break;
-	        	}
+				if( version_compare($this->view['current_version'], $upgrade_version, '<') )
+				{
+					$this->view['upgrade_notice'] = $upgrade_text;
+					break;
+				}
 	        	
-        	 }
-        }
+			 }
+		}
 		
 		
 	}

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 	function __construct() {
 	
 		// actions
-		add_action('admin_menu', array($this, 'admin_menu'), 20 );
+		add_action('admin_menu', array($this, 'admin_menu'), 20);
 		
 	}
 	
@@ -46,7 +46,7 @@ 
 		
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 			
@@ -54,7 +54,7 @@ 
 		
 		
 		// bail early if no show_updates
-		if( !acf_get_setting('show_updates') ) {
+		if ( ! acf_get_setting('show_updates')) {
 			
 			return;
 			
@@ -62,7 +62,7 @@ 
 		
 		
 		// bail early if not a plugin (included in theme)
-		if( !is_plugin_active($basename) ) {
+		if ( ! is_plugin_active($basename)) {
 			
 			return;
 			
@@ -70,11 +70,11 @@ 
 				
 		
 		// add page
-		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Updates','acf'), __('Updates','acf'), acf_get_setting('capability'),'acf-settings-updates', array($this,'html') );
+		$page = add_submenu_page('edit.php?post_type=acf-field-group', __('Updates', 'acf'), __('Updates', 'acf'), acf_get_setting('capability'), 'acf-settings-updates', array($this, 'html'));
 		
 		
 		// actions
-		add_action('load-' . $page, array($this,'load'));
+		add_action('load-'.$page, array($this, 'load'));
 		
 	}
 	
@@ -95,11 +95,11 @@ 
 	function load() {
 		
 		// $_POST
-		if( acf_verify_nonce('activate_pro_licence') ) {
+		if (acf_verify_nonce('activate_pro_licence')) {
 		
 			$this->activate_pro_licence();
 			
-		} elseif( acf_verify_nonce('deactivate_pro_licence') ) {
+		} elseif (acf_verify_nonce('deactivate_pro_licence')) {
 		
 			$this->deactivate_pro_licence();
 			
@@ -119,7 +119,7 @@ 
 		
 		
 		// license
-		if( acf_pro_is_license_active() ) {
+		if (acf_pro_is_license_active()) {
 		
 			$this->view['license'] = acf_pro_get_license();
 			$this->view['active'] = 1;
@@ -132,9 +132,9 @@ 
 		
 		
 		// validate
-        if( empty($info) ) {
+        if (empty($info)) {
         
-        	acf_add_admin_notice( __('<b>Error</b>. Could not connect to update server', 'acf'), 'error');
+        	acf_add_admin_notice(__('<b>Error</b>. Could not connect to update server', 'acf'), 'error');
         	return;
         	
         }
@@ -145,7 +145,7 @@ 
         
         
         // add changelog if the remote version is '>' than the current version
-		if( acf_pro_is_update_available() )
+		if (acf_pro_is_update_available())
         {
         	$this->view['update_available'] = true;
         	 
@@ -153,10 +153,10 @@ 
         	// changelog
         	$changelogs = explode('<h4>', $info['changelog']);
         	
-        	foreach( $changelogs as $changelog )
+        	foreach ($changelogs as $changelog)
         	{
         		// validate (first segment is always empty due to explode)
-	        	if( empty($changelog) )
+	        	if (empty($changelog))
 	        	{
 		        	continue;
 	        	}
@@ -168,7 +168,7 @@ 
 	        	$changelog_text = trim($changelog[1]);
 	        	$changelog_text = str_replace('<ul>', '<ul class="ul-disc">', $changelog_text);
 	        	
-	        	if( version_compare($this->view['remote_version'], $changelog_version, '==') )
+	        	if (version_compare($this->view['remote_version'], $changelog_version, '=='))
 	        	{
 		        	$this->view['changelog'] = $changelog_text;
 		        	break;
@@ -180,10 +180,10 @@ 
         	// upgrade_notice
         	$upgrade_notices = explode('<h4>', $info['upgrade_notice']);
         	
-        	foreach( $upgrade_notices as $upgrade_notice )
+        	foreach ($upgrade_notices as $upgrade_notice)
         	{
         		// validate (first segment is always empty due to explode)
-	        	if( empty($upgrade_notice) )
+	        	if (empty($upgrade_notice))
 	        	{
 		        	continue;
 	        	}
@@ -195,7 +195,7 @@ 
 	        	$upgrade_text = trim($upgrade_notice[1]);
 	        	$upgrade_text = str_replace('<ul>', '<ul class="ul-disc">', $upgrade_text);
 	        	
-	        	if( version_compare($this->view['current_version'], $upgrade_version, '<') )
+	        	if (version_compare($this->view['current_version'], $upgrade_version, '<'))
 	        	{
 		        	$this->view['upgrade_notice'] = $upgrade_text;
 		        	break;
@@ -258,13 +258,13 @@ 
 		
 		
 		// connect
-		$response = acf_pro_get_remote_response( 'activate-license', $args );
+		$response = acf_pro_get_remote_response('activate-license', $args);
 		
 		
 		// validate
-		if( empty($response) ) {
+		if (empty($response)) {
 			
-			acf_add_admin_notice( __('<b>Connection Error</b>. Sorry, please try again', 'acf'), 'error');
+			acf_add_admin_notice(__('<b>Connection Error</b>. Sorry, please try again', 'acf'), 'error');
 			return;
 			
 		}
@@ -276,7 +276,7 @@ 
 		
 		
 		// action
-		if( $response['status'] == 1 ) {
+		if ($response['status'] == 1) {
 			
 			acf_pro_update_license($response['license']);
 			
@@ -288,7 +288,7 @@ 
 		
 		
 		// show message
-		if( $response['message'] ) {
+		if ($response['message']) {
 			
 			acf_add_admin_notice($response['message'], $class);
 			
@@ -313,7 +313,7 @@ 
 	function deactivate_pro_licence() {
 		
 		// validate
-		if( !acf_pro_is_license_active() ) {
+		if ( ! acf_pro_is_license_active()) {
 			
 			return;
 			
@@ -329,11 +329,11 @@ 
 		
 		
 		// connect
-		$response = acf_pro_get_remote_response( 'deactivate-license', $args );
+		$response = acf_pro_get_remote_response('deactivate-license', $args);
 		
 		
 		// validate
-		if( empty($response) ) {
+		if (empty($response)) {
 		
 			acf_add_admin_notice(__('<b>Connection Error</b>. Sorry, please try again', 'acf'), 'error');
 			return;
@@ -351,7 +351,7 @@ 
 		
 		
 		// action
-		if( $response['status'] == 1 ) {
+		if ($response['status'] == 1) {
 		
 			
 			
@@ -363,7 +363,7 @@ 
 		
 		
 		// show message
-		if( $response['message'] ) {
+		if ($response['message']) {
 		
 			acf_add_admin_notice($response['message'], $class);
 			

includes/acf/pro/admin/views/options-page.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 			'nonce'		=> 'options',
 		));
 		
-		wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+		wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 		
 		?>
 		
@@ -45,13 +45,13 @@ 
 						<!-- Update -->
 						<div id="submitdiv" class="postbox">
 							
-							<h3 class="hndle" style="border-bottom:none;"><span><?php _e("Publish",'acf'); ?></span></h3>
+							<h3 class="hndle" style="border-bottom:none;"><span><?php _e("Publish", 'acf'); ?></span></h3>
 							
 							<div id="major-publishing-actions">
 
 								<div id="publishing-action">
 									<span class="spinner"></span>
-									<input type="submit" accesskey="p" value="<?php _e("Save Options",'acf'); ?>" class="button button-primary button-large" id="publish" name="publish">
+									<input type="submit" accesskey="p" value="<?php _e("Save Options", 'acf'); ?>" class="button button-primary button-large" id="publish" name="publish">
 								</div>
 								
 								<div class="clear"></div>

includes/acf/pro/admin/views/settings-updates.php

Spacing +7 added lines, -7 removed lines

@@ -18,13 +18,13 @@ 
 	
 	<div class="acf-box">
 		<div class="title">
-			<h3><?php echo acf_get_setting('name'); ?> <?php _e('License','acf') ?></h3>
+			<h3><?php echo acf_get_setting('name'); ?> <?php _e('License', 'acf') ?></h3>
 		</div>
 		<div class="inner">
-			<p><?php _e("To unlock updates, please enter your license key below. If you don't have a licence key, please see",'acf'); ?> <a href="http://www.advancedcustomfields.com/pro" target="_blank"><?php _e('details & pricing', 'acf'); ?></a></p>
+			<p><?php _e("To unlock updates, please enter your license key below. If you don't have a licence key, please see", 'acf'); ?> <a href="http://www.advancedcustomfields.com/pro" target="_blank"><?php _e('details & pricing', 'acf'); ?></a></p>
 			<form action="" method="post">
 			<div class="acf-hidden">
-				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( $nonce ); ?>" />
+				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce($nonce); ?>" />
 			</div>
 			<table class="form-table">
                 <tbody>
@@ -88,11 +88,11 @@ 
                     		<label><?php _e('Update Available', 'acf'); ?></label>
                     	</th>
 						<td>
-							<?php if( $update_available ): ?>
+							<?php if ($update_available): ?>
 								
 								<span style="margin-right: 5px;"><?php _e('Yes', 'acf'); ?></span>
 								
-								<?php if( $active ): ?>
+								<?php if ($active): ?>
 									<a class="acf-button blue" href="<?php echo admin_url('plugins.php?s=Advanced+Custom+Fields+Pro'); ?>"><?php _e('Update Plugin', 'acf'); ?></a>
 								<?php else: ?>
 									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf'); ?></a>
@@ -105,7 +105,7 @@ 
 							<?php endif; ?>
 						</td>
 					</tr>
-					<?php if( $changelog ): ?>
+					<?php if ($changelog): ?>
 					<tr>
                     	<th>
                     		<label><?php _e('Changelog', 'acf'); ?></label>
@@ -115,7 +115,7 @@ 
 						</td>
 					</tr>
 					<?php endif; ?>
-					<?php if( $upgrade_notice ): ?>
+					<?php if ($upgrade_notice): ?>
 					<tr>
                     	<th>
                     		<label><?php _e('Upgrade Notice', 'acf'); ?></label>

Braces +10 added lines, -4 removed lines

@@ -94,13 +94,19 @@
 								
 								<?php if( $active ): ?>
 									<a class="acf-button blue" href="<?php echo admin_url('plugins.php?s=Advanced+Custom+Fields+Pro'); ?>"><?php _e('Update Plugin', 'acf'); ?></a>
-								<?php else: ?>
-									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf'); ?></a>
+								<?php else {
+	: ?>
+									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf');
+}
+?></a>
 								<?php endif; ?>
 								
-							<?php else: ?>
+							<?php else {
+	: ?>
 								
-								<span style="margin-right: 5px;"><?php _e('No', 'acf'); ?></span>
+								<span style="margin-right: 5px;"><?php _e('No', 'acf');
+}
+?></span>
 								<a class="acf-button" href="<?php echo add_query_arg('force-check', 1); ?>"><?php _e('Check Again', 'acf'); ?></a>
 							<?php endif; ?>
 						</td>

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

Spacing +56 added lines, -56 removed lines

@@ -13,18 +13,18 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_valid_options_page( $page = '' ) {
+function acf_get_valid_options_page($page = '') {
 	
 	// allow for string
-	if( empty($page) ) {
+	if (empty($page)) {
 		
 		$page = array(
-			'page_title' 	=> __('Options','acf'),
-			'menu_title'	=> __('Options','acf'),
+			'page_title' 	=> __('Options', 'acf'),
+			'menu_title'	=> __('Options', 'acf'),
 			'menu_slug' 	=> 'acf-options',
 		);
 			
-	} elseif( is_string($page) ) {
+	} elseif (is_string($page)) {
 	
 		$page_title = $page;
 		
@@ -58,11 +58,11 @@ 
 		'parent'	=> 'parent_slug'
 	);
 	
-	foreach( $migrate as $old => $new ) {
+	foreach ($migrate as $old => $new) {
 		
-		if( !empty($page[ $old ]) ) {
+		if ( ! empty($page[$old])) {
 			
-			$page[ $new ] = acf_extract_var( $page, $old );
+			$page[$new] = acf_extract_var($page, $old);
 			
 		}
 		
@@ -70,7 +70,7 @@ 
 	
 	
 	// page_title (allows user to define page with just page_title or title)
-	if( empty($page['menu_title']) ) {
+	if (empty($page['menu_title'])) {
 	
 		$page['menu_title'] = $page['page_title'];
 		
@@ -78,9 +78,9 @@ 
 	
 	
 	// menu_slug
-	if( empty($page['menu_slug']) ) {
+	if (empty($page['menu_slug'])) {
 	
-		$page['menu_slug'] = 'acf-options-' . sanitize_title( $page['menu_title'] );
+		$page['menu_slug'] = 'acf-options-'.sanitize_title($page['menu_title']);
 		
 	}
 	
@@ -104,10 +104,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_options_page( $slug ) {
+function acf_get_options_page($slug) {
 	
 	// bail early if page doens't exist
-	if( empty($GLOBALS['acf_options_pages'][ $slug ]) ) {
+	if (empty($GLOBALS['acf_options_pages'][$slug])) {
 		
 		return false;
 		
@@ -115,7 +115,7 @@ 
 	
 	
 	// vars
-	$page = $GLOBALS['acf_options_pages'][ $slug ];
+	$page = $GLOBALS['acf_options_pages'][$slug];
 	
 					
 	// filter for 3rd party customization
@@ -148,7 +148,7 @@ 
 		
 		
 	// bail early if empty
-	if( empty($GLOBALS['acf_options_pages']) ) {
+	if (empty($GLOBALS['acf_options_pages'])) {
 		
 		return false;
 		
@@ -162,18 +162,18 @@ 
 	
 	
 	// get pages
-	foreach( $slugs as $slug ) {
+	foreach ($slugs as $slug) {
 	
 		// append
-		$pages[] = acf_get_options_page( $slug );
+		$pages[] = acf_get_options_page($slug);
 		
 	}
 	
 
-	foreach( $pages as $i => $page ) {
+	foreach ($pages as $i => $page) {
 			
 		// bail early if is child
-		if( !empty($page['parent_slug']) ) {
+		if ( ! empty($page['parent_slug'])) {
 			
 			continue;
 			
@@ -181,17 +181,17 @@ 
 		
 		
 		// add missing position
-		if( !$page['position']) {
+		if ( ! $page['position']) {
 			
 			$_wp_last_utility_menu++;
 			
-			$pages[ $i ]['position'] = $_wp_last_utility_menu;
+			$pages[$i]['position'] = $_wp_last_utility_menu;
 			
 		}
 	
 		
 		// bail early if no redirect
-		if( empty($page['redirect']) ) {
+		if (empty($page['redirect'])) {
 			
 			continue;
 			
@@ -204,10 +204,10 @@ 
 		
 		
 		// update children
-		foreach( $pages as $j => $sub_page ) {
+		foreach ($pages as $j => $sub_page) {
 			
 			// bail early if not child
-			if( $sub_page['parent_slug'] !== $parent ) {
+			if ($sub_page['parent_slug'] !== $parent) {
 				
 				continue;
 				
@@ -215,7 +215,7 @@ 
 			
 			
 			// update $child if empt
-			if( empty($child) ) {
+			if (empty($child)) {
 				
 				$child = $sub_page['menu_slug'];
 				
@@ -223,15 +223,15 @@ 
 			
 			
 			// update parent_slug
-			$pages[ $j ]['parent_slug'] = $child;
+			$pages[$j]['parent_slug'] = $child;
 			
 		}
 		
 		
 		// finally update parent menu_slug
-		if( $child ) {
+		if ($child) {
 			
-			$pages[ $i ]['menu_slug'] = $child;
+			$pages[$i]['menu_slug'] = $child;
 			
 		}
 		
@@ -257,10 +257,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_update_options_page( $data ) {
+function acf_update_options_page($data) {
 	
 	// bail early if no menu_slug
-	if( empty($data['menu_slug']) ) {
+	if (empty($data['menu_slug'])) {
 		
 		return false;
 		
@@ -271,7 +271,7 @@ 
 	
 	
 	// bail early if no page found
-	if( empty($GLOBALS['acf_options_pages'][ $slug ]) ) {
+	if (empty($GLOBALS['acf_options_pages'][$slug])) {
 	
 		return false;
 		
@@ -279,7 +279,7 @@ 
 	
 	
 	// vars
-	$page = $GLOBALS['acf_options_pages'][ $slug ];
+	$page = $GLOBALS['acf_options_pages'][$slug];
 	
 	
 	// merge in data
@@ -287,7 +287,7 @@ 
 	
 	
 	// update
-	$GLOBALS['acf_options_pages'][ $slug ] = $page;
+	$GLOBALS['acf_options_pages'][$slug] = $page;
 	
 	
 	// return
@@ -309,16 +309,16 @@ 
 *  @return	$post_id (int)
 */
 
-if( ! function_exists('acf_add_options_page') ):
+if ( ! function_exists('acf_add_options_page')):
 
-function acf_add_options_page( $page = '' ) {
+function acf_add_options_page($page = '') {
 	
 	// validate
-	$page = acf_get_valid_options_page( $page );
+	$page = acf_get_valid_options_page($page);
 	
 	
 	// instantiate globals
-	if( empty($GLOBALS['acf_options_pages']) ) {
+	if (empty($GLOBALS['acf_options_pages'])) {
 	
 		$GLOBALS['acf_options_pages'] = array();
 		
@@ -326,15 +326,15 @@ 
 	
 	
 	// update if already exists
-	if( acf_get_options_page($page['menu_slug']) ) {
+	if (acf_get_options_page($page['menu_slug'])) {
 		
-		return acf_update_options_page( $page );
+		return acf_update_options_page($page);
 		
 	}
 	
 	
 	// append
-	$GLOBALS['acf_options_pages'][ $page['menu_slug'] ] = $page;
+	$GLOBALS['acf_options_pages'][$page['menu_slug']] = $page;
 	
 	
 	// return
@@ -358,16 +358,16 @@ 
 *  @return	$post_id (int)
 */
 
-if( ! function_exists('acf_add_options_sub_page') ):
+if ( ! function_exists('acf_add_options_sub_page')):
 
-function acf_add_options_sub_page( $page = '' ) {
+function acf_add_options_sub_page($page = '') {
 	
 	// validate
-	$page = acf_get_valid_options_page( $page );
+	$page = acf_get_valid_options_page($page);
 	
 	
 	// parent
-	if( !$page['parent_slug'] ) {
+	if ( ! $page['parent_slug']) {
 		
 		// set parent slug
 		$page['parent_slug'] = 'acf-options';
@@ -376,9 +376,9 @@ 
 	
 	
 	// create default parent if not yet exists
-	if( $page['parent_slug'] === 'acf-options' ) {
+	if ($page['parent_slug'] === 'acf-options') {
 		
-		if( !acf_get_options_page('acf-options') ) {
+		if ( ! acf_get_options_page('acf-options')) {
 			
 			acf_add_options_page();
 			
@@ -388,7 +388,7 @@ 
 		
 	
 	// return
-	return acf_add_options_page( $page );
+	return acf_add_options_page($page);
 	
 }
 
@@ -408,9 +408,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_title') ):
+if ( ! function_exists('acf_set_options_page_title')):
 
-function acf_set_options_page_title( $title = 'Options' ) {
+function acf_set_options_page_title($title = 'Options') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -436,9 +436,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_menu') ):
+if ( ! function_exists('acf_set_options_page_menu')):
 
-function acf_set_options_page_menu( $title = 'Options' ) {
+function acf_set_options_page_menu($title = 'Options') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -463,9 +463,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_capability') ):
+if ( ! function_exists('acf_set_options_page_capability')):
 
-function acf_set_options_page_capability( $capability = 'edit_posts' ) {
+function acf_set_options_page_capability($capability = 'edit_posts') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -490,11 +490,11 @@ 
 *  @return	N/A
 */
 
-if( ! function_exists('register_options_page') ):
+if ( ! function_exists('register_options_page')):
 
-function register_options_page( $title = false ) {
+function register_options_page($title = false) {
 
-	acf_add_options_sub_page( $title );
+	acf_add_options_sub_page($title);
 	
 }
 

includes/acf/pro/core/updates.php

Indentation +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
 		
 		// append plugin information
 		// Note: is_admin() was used previously, however this prevents jetpack manage & ManageWP from working
-	    add_filter('plugins_api', array($this, 'inject_info'), 20, 3);
+		add_filter('plugins_api', array($this, 'inject_info'), 20, 3);
 	    
 	    
 		// append update information
@@ -59,33 +59,33 @@ 
         
         
 		// validate
-    	if( isset($args->slug) && $args->slug == $slug ) {
+		if( isset($args->slug) && $args->slug == $slug ) {
 	    	
-	    	$info = acf_pro_get_remote_info();
-	    	$sections = acf_extract_vars($info, array(
-	    		'description',
-	    		'installation',
-	    		'changelog',
-	    		'upgrade_notice',
-	    	));
+			$info = acf_pro_get_remote_info();
+			$sections = acf_extract_vars($info, array(
+				'description',
+				'installation',
+				'changelog',
+				'upgrade_notice',
+			));
 	    	
-	    	$obj = new stdClass();
+			$obj = new stdClass();
 		
-		    foreach( $info as $k => $v ) {
+			foreach( $info as $k => $v ) {
 			    
-		        $obj->$k = $v;
+				$obj->$k = $v;
 		        
-		    }
+			}
 		    
-		    $obj->sections = $sections;
+			$obj->sections = $sections;
 
-		    return $obj;
+			return $obj;
 		    
-    	}
+		}
     	
     	
-    	// return        
-        return $result;
+		// return        
+		return $result;
         
 	}
 	
@@ -133,22 +133,22 @@ 
 		}
 		
 		 
-        // vars
+		// vars
 		$info = acf_pro_get_remote_info();
 		$basename = acf_get_setting('basename');
 		$slug = acf_get_setting('slug');
 		
 		
-        // create new object for update
-        $obj = new stdClass();
-        $obj->slug = $slug;
-        $obj->plugin = $basename;
-        $obj->new_version = $info['version'];
-        $obj->url = $info['homepage'];
-        $obj->package = '';
+		// create new object for update
+		$obj = new stdClass();
+		$obj->slug = $slug;
+		$obj->plugin = $basename;
+		$obj->new_version = $info['version'];
+		$obj->url = $info['homepage'];
+		$obj->package = '';
         
         
-        // license
+		// license
 		if( acf_pro_is_license_active() ) {
 			
 			$obj->package = acf_pro_get_remote_url('download', array(
@@ -161,12 +161,12 @@ 
 		}
 		
         
-        // add to transient
-        $transient->response[ $basename ] = $obj;
+		// add to transient
+		$transient->response[ $basename ] = $obj;
         
 		
 		// return 
-        return $transient;
+		return $transient;
         
 	}
 	

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php 
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if( ! class_exists('acf_pro_updates') ) :
+if ( ! class_exists('acf_pro_updates')) :
 
 class acf_pro_updates {
 	
@@ -32,7 +32,7 @@ 
 		
 		
 		// add custom message when PRO not activated but update available
-		add_action('in_plugin_update_message-' . acf_get_setting('basename'), array($this, 'in_plugin_update_message'), 10, 2 );
+		add_action('in_plugin_update_message-'.acf_get_setting('basename'), array($this, 'in_plugin_update_message'), 10, 2);
 			
 	}
 	
@@ -52,14 +52,14 @@ 
 	*  @return	$result
 	*/
 	
-	function inject_info( $result, $action = null, $args = null ) {
+	function inject_info($result, $action = null, $args = null) {
 		
 		// vars
 		$slug = acf_get_setting('slug');
         
         
 		// validate
-    	if( isset($args->slug) && $args->slug == $slug ) {
+    	if (isset($args->slug) && $args->slug == $slug) {
 	    	
 	    	$info = acf_pro_get_remote_info();
 	    	$sections = acf_extract_vars($info, array(
@@ -71,7 +71,7 @@ 
 	    	
 	    	$obj = new stdClass();
 		
-		    foreach( $info as $k => $v ) {
+		    foreach ($info as $k => $v) {
 			    
 		        $obj->$k = $v;
 		        
@@ -103,14 +103,14 @@ 
 	*  @return	$transient
 	*/
 	
-	function inject_update( $transient ) {
+	function inject_update($transient) {
 		
 		// vars
 		$basename = acf_get_setting('basename');
 		
 		
 		// bail early if no show_updates
-		if( !acf_get_setting('show_updates') ) {
+		if ( ! acf_get_setting('show_updates')) {
 			
 			return $transient;
 			
@@ -118,7 +118,7 @@ 
 		
 		
 		// bail early if not a plugin (included in theme)
-		if( !is_plugin_active($basename) ) {
+		if ( ! is_plugin_active($basename)) {
 			
 			return;
 			
@@ -126,7 +126,7 @@ 
 		
 				
 		// bail early if no update available
-		if( !acf_pro_is_update_available() ) {
+		if ( ! acf_pro_is_update_available()) {
 			
 			return $transient;
 			
@@ -149,7 +149,7 @@ 
         
         
         // license
-		if( acf_pro_is_license_active() ) {
+		if (acf_pro_is_license_active()) {
 			
 			$obj->package = acf_pro_get_remote_url('download', array(
 				'k'				=> acf_pro_get_license(),
@@ -162,7 +162,7 @@ 
 		
         
         // add to transient
-        $transient->response[ $basename ] = $obj;
+        $transient->response[$basename] = $obj;
         
 		
 		// return 
@@ -184,10 +184,10 @@ 
 	*  @param	{object}	$r
 	*/
 
-	function in_plugin_update_message( $plugin_data, $r ) {
+	function in_plugin_update_message($plugin_data, $r) {
 		
 		// validate
-		if( acf_pro_is_license_active() ) {
+		if (acf_pro_is_license_active()) {
 			
 			return;
 			
@@ -199,7 +199,7 @@ 
 		
 		
 		// show message
-		echo '<br />' . sprintf( $m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'http://www.advancedcustomfields.com/pro');
+		echo '<br />'.sprintf($m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'http://www.advancedcustomfields.com/pro');
 	
 	}
 	

Braces +4 added lines, -1 removed lines

@@ -1,6 +1,9 @@
 <?php 
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 if( ! class_exists('acf_pro_updates') ) :