",'
"].join(""));this.$el&&this.$el.replaceWith(o),this.$el=o,acf.doAction("append",o)},update:function(t){this.data=acf.parseArgs(t,this.data),this.render()},title:function(t){this.$(".acf-modal-title h2").html(t)},content:function(t){this.$(".acf-modal-content").html(t)},toolbar:function(t){this.$(".acf-modal-toolbar").html(t)},open:function(){t("body").append(this.$el)},close:function(){this.remove()},onClickClose:function(t,e){t.preventDefault(),this.close()}}),acf.newModal=function(t){return new acf.models.Modal(t)}}(jQuery),function(t,e){var n=new acf.Model({events:{"click .acf-panel-title":"onClick"},onClick:function(t,e){t.preventDefault(),this.toggle(e.parent())},isOpen:function(t){return t.hasClass("-open")},toggle:function(t){this.isOpen(t)?this.close(t):this.open(t)},open:function(t){t.addClass("-open"),t.find(".acf-panel-title i").attr("class","dashicons dashicons-arrow-down")},close:function(t){t.removeClass("-open"),t.find(".acf-panel-title i").attr("class","dashicons dashicons-arrow-right")}})}(jQuery),function(t,e){var n=acf.Model.extend({data:{text:"",type:"",timeout:0,dismiss:!0,target:!1,close:function(){}},events:{"click .acf-notice-dismiss":"onClickClose"},tmpl:function(){return''},setup:function(e){t.extend(this.data,e),this.$el=t(this.tmpl())},initialize:function(){this.render(),this.show()},render:function(){this.type(this.get("type")),this.html("','
",'',"',"
",'"+e+"
",'',"'+n+"
",''+i+"
",""+this.get("text")+"
"),this.get("dismiss")&&(this.$el.append(''),this.$el.addClass("-dismiss"));var t=this.get("timeout");t&&this.away(t)},update:function(e){t.extend(this.data,e),this.initialize(),this.removeEvents(),this.addEvents()},show:function(){var t=this.get("target");t&&t.prepend(this.$el)},hide:function(){this.$el.remove()},away:function(t){this.setTimeout((function(){acf.remove(this.$el)}),t)},type:function(t){var e=this.get("type");e&&this.$el.removeClass("-"+e),this.$el.addClass("-"+t),"error"==t&&this.$el.addClass("acf-error-message")},html:function(t){this.$el.html(acf.escHtml(t))},text:function(t){this.$("p").html(acf.escHtml(t))},onClickClose:function(t,e){t.preventDefault(),this.get("close").apply(this,arguments),this.remove()}});acf.newNotice=function(t){return"object"!=typeof t&&(t={text:t}),new n(t)};var i=new acf.Model({wait:"prepare",priority:1,initialize:function(){var e=t(".acf-admin-notice");e.length&&t("h1:first").after(e)}})}(jQuery),function(t,e){acf.newTooltip=function(t){return"object"!=typeof t&&(t={text:t}),void 0!==t.confirmRemove?(t.textConfirm=acf.__("Remove"),t.textCancel=acf.__("Cancel"),new i(t)):void 0!==t.confirm?new i(t):new n(t)};var n=acf.Model.extend({data:{text:"",timeout:0,target:null},tmpl:function(){return''},setup:function(e){t.extend(this.data,e),this.$el=t(this.tmpl())},initialize:function(){this.render(),this.show(),this.position();var e=this.get("timeout");e&&setTimeout(t.proxy(this.fade,this),e)},update:function(e){t.extend(this.data,e),this.initialize()},render:function(){this.html(this.get("text"))},show:function(){t("body").append(this.$el)},hide:function(){this.$el.remove()},fade:function(){this.$el.addClass("acf-fade-up"),this.setTimeout((function(){this.remove()}),250)},html:function(t){this.$el.html(t)},position:function(){var e=this.$el,n=this.get("target");if(n){e.removeClass("right left bottom top").css({top:0,left:0});var i=10,o=n.outerWidth(),r=n.outerHeight(),a=n.offset().top,s=n.offset().left,c=e.outerWidth(),l=e.outerHeight(),u=e.offset().top,f=a-l-u,d=s+o/2-c/2;d<10?(e.addClass("right"),d=s+o,f=a+r/2-l/2-u):d+c+10>t(window).width()?(e.addClass("left"),d=s-c,f=a+r/2-l/2-u):f-t(window).scrollTop()<10?(e.addClass("bottom"),f=a+r-u):e.addClass("top"),e.css({top:f,left:d})}}}),i=n.extend({data:{text:"",textConfirm:"",textCancel:"",target:null,targetConfirm:!0,confirm:function(){},cancel:function(){},context:!1},events:{'click [data-event="cancel"]':"onCancel",'click [data-event="confirm"]':"onConfirm"},addEvents:function(){acf.Model.prototype.addEvents.apply(this);var e=t(document),n=this.get("target");this.setTimeout((function(){this.on(e,"click","onCancel")})),this.get("targetConfirm")&&this.on(n,"click","onConfirm")},removeEvents:function(){acf.Model.prototype.removeEvents.apply(this);var e=t(document),n=this.get("target");this.off(e,"click"),this.off(n,"click")},render:function(){var t,e,n,i=[this.get("text")||acf.__("Are you sure?"),''+(this.get("textConfirm")||acf.__("Yes"))+"",''+(this.get("textCancel")||acf.__("No"))+""].join(" ");this.html(i),this.$el.addClass("-confirm")},onCancel:function(t,e){t.preventDefault(),t.stopImmediatePropagation();var n=this.get("cancel"),i=this.get("context")||this;n.apply(i,arguments),this.remove()},onConfirm:function(t,e){t.preventDefault(),t.stopImmediatePropagation();var n=this.get("confirm"),i=this.get("context")||this;n.apply(i,arguments),this.remove()}});acf.models.Tooltip=n,acf.models.TooltipConfirm=i;var o=new acf.Model({tooltip:!1,events:{"mouseenter .acf-js-tooltip":"showTitle","mouseup .acf-js-tooltip":"hideTitle","mouseleave .acf-js-tooltip":"hideTitle"},showTitle:function(t,e){var n=e.attr("title");n&&(e.attr("title",""),this.tooltip?this.tooltip.update({text:n,target:e}):this.tooltip=acf.newTooltip({text:n,target:e}))},hideTitle:function(t,e){this.tooltip.hide(),e.attr("title",this.tooltip.get("text"))}})}(jQuery); \ No newline at end of file diff --git a/includes/acf-field-functions.php b/includes/acf-field-functions.php index db35c56d..3c0fa3ea 100644 --- a/includes/acf-field-functions.php +++ b/includes/acf-field-functions.php @@ -1355,22 +1355,17 @@ function acf_get_field_ancestors( $field ) { * @return array */ function acf_duplicate_fields( $fields = array(), $parent_id = 0 ) { - - // Vars. - $duplicates = array(); - - // Loop over fields and pre-generate new field keys (needed for conditional logic). + + // Generate keys for all new fields + // - Needed to alter conditional logic rules + // - Use usleep() to ensure unique keys. $keys = array(); foreach( $fields as $field ) { - - // Delay for a microsecond to ensure a unique ID. usleep(1); $keys[ $field['key'] ] = uniqid('field_'); } - - // Store these keys for later use. - acf_set_data( 'duplicates', $keys ); - + acf_append_data( 'generated_keys', $keys ); + // Duplicate fields. foreach( $fields as $field ) { $field_id = $field['ID'] ? $field['ID'] : $field['key']; @@ -1407,8 +1402,12 @@ function acf_duplicate_field( $id = 0, $parent_id = 0 ){ $field['ID'] = 0; // Generate key. - $keys = acf_get_data( 'duplicates' ); - $field['key'] = isset($keys[ $field['key'] ]) ? $keys[ $field['key'] ] : uniqid('field_'); + $keys = acf_get_data( 'generated_keys' ); + if( isset( $keys[ $field['key'] ] ) ) { + $field['key'] = $keys[ $field['key'] ]; + } else { + $field['key'] = uniqid('field_'); + } // Set parent. if( $parent_id ) { diff --git a/includes/acf-field-group-functions.php b/includes/acf-field-group-functions.php index e401839b..53547b30 100644 --- a/includes/acf-field-group-functions.php +++ b/includes/acf-field-group-functions.php @@ -224,9 +224,10 @@ function acf_validate_field_group( $field_group = array() ) { // Convert types. $field_group['ID'] = (int) $field_group['ID']; $field_group['menu_order'] = (int) $field_group['menu_order']; + $field_group['active'] = (bool) $field_group['active']; // Field group is now valid. - $field_group['_valid'] = 1; + $field_group['_valid'] = true; /** * Filters the $field_group array to validate settings. diff --git a/includes/acf-helper-functions.php b/includes/acf-helper-functions.php index f4b2cd83..4a810704 100644 --- a/includes/acf-helper-functions.php +++ b/includes/acf-helper-functions.php @@ -404,4 +404,35 @@ function acf_did( $name ) { */ function acf_strlen( $str ) { return mb_strlen( str_replace("\r\n", "\n", wp_specialchars_decode( wp_unslash( $str ) ) ) ); +} + +/** + * Returns a value with default fallback. + * + * @date 6/4/20 + * @since 5.9.0 + * + * @param mixed $value The value. + * @param mixed $default_value The default value. + * @return mixed + */ +function acf_with_default( $value, $default_value ) { + return $value ? $value : $default_value; +} + +/** + * Returns the current priority of a running action. + * + * @date 14/07/2020 + * @since 5.9.0 + * + * @param string $action The action name. + * @return int|bool + */ +function acf_doing_action( $action ) { + global $wp_filter; + if( isset( $wp_filter[ $action ] ) ) { + return $wp_filter[ $action ]->current_priority(); + } + return false; } \ No newline at end of file diff --git a/includes/acf-post-functions.php b/includes/acf-post-functions.php index 06abc622..f1cf57d5 100644 --- a/includes/acf-post-functions.php +++ b/includes/acf-post-functions.php @@ -1,9 +1,7 @@ templates data. + * Returns available templates for each post type. * * @date 29/8/17 * @since 5.6.2 @@ -13,14 +11,19 @@ */ function acf_get_post_templates() { - // Defaults. - $post_templates = array( - 'page' => array() - ); + // Check store. + $cache = acf_get_data( 'post_templates' ); + if( $cache !== null ) { + return $cache; + } + + // Initialize templates with default placeholder for pages. + $post_templates = array(); + $post_templates['page'] = array(); // Loop over post types and append their templates. if( method_exists('WP_Theme', 'get_page_templates') ) { - $post_types = acf_get_post_types(); + $post_types = get_post_types(); foreach( $post_types as $post_type ) { $templates = wp_get_theme()->get_page_templates( null, $post_type ); if( $templates ) { @@ -29,6 +32,9 @@ function acf_get_post_templates() { } } - // Return. + // Update store. + acf_set_data( 'post_templates', $post_templates ); + + // Return templates. return $post_templates; } \ No newline at end of file diff --git a/includes/acf-wp-functions.php b/includes/acf-wp-functions.php new file mode 100644 index 00000000..89b9ad82 --- /dev/null +++ b/includes/acf-wp-functions.php @@ -0,0 +1,108 @@ + $object_type, + 'subtype' => $object_subtype, + 'name' => '', + 'label' => '', + 'icon' => '' + ); + + // Set unique identifier as name. + if( $object_subtype ) { + $props['name'] = "$object_type/$object_subtype"; + } else { + $props['name'] = $object_type; + } + + // Set label and icon. + switch ( $object_type ) { + case 'post': + if( $object_subtype ) { + $post_type = get_post_type_object( $object_subtype ); + if( $post_type ) { + $props['label'] = $post_type->labels->name; + $props['icon'] = acf_with_default( $post_type->menu_icon, 'dashicons-admin-post' ); + } else { + return false; + } + } else { + $props['label'] = __('Posts', 'acf'); + $props['icon'] = 'dashicons-admin-post'; + } + break; + case 'term': + if( $object_subtype ) { + $taxonomy = get_taxonomy( $object_subtype ); + if( $taxonomy ) { + $props['label'] = $taxonomy->labels->name; + } else { + return false; + } + } else { + $props['label'] = __('Taxonomies', 'acf'); + } + $props['icon'] = 'dashicons-tag'; + break; + case 'attachment': + $props['label'] = __('Attachments', 'acf'); + $props['icon'] = 'dashicons-admin-media'; + break; + case 'comment': + $props['label'] = __('Comments', 'acf'); + $props['icon'] = 'dashicons-admin-comments'; + break; + case 'widget': + $props['label'] = __('Widgets', 'acf'); + $props['icon'] = 'dashicons-screenoptions'; + break; + case 'menu': + $props['label'] = __('Menus', 'acf'); + $props['icon'] = 'dashicons-admin-appearance'; + break; + case 'menu_item': + $props['label'] = __('Menu items', 'acf'); + $props['icon'] = 'dashicons-admin-appearance'; + break; + case 'user': + $props['label'] = __('Users', 'acf'); + $props['icon'] = 'dashicons-admin-users'; + break; + case 'option': + $props['label'] = __('Options', 'acf'); + $props['icon'] = 'dashicons-admin-generic'; + break; + case 'block': + $props['label'] = __('Blocks', 'acf'); + $props['icon'] = acf_version_compare('wp', '>=', '5.5') ? 'dashicons-block-default' : 'dashicons-layout'; + break; + default: + return false; + } + + // Convert to object. + $object = (object) $props; + + /** + * Filters the object type. + * + * @date 6/4/20 + * @since 5.9.0 + * + * @param object $object The object props. + * @param string $object_type The object type (post, term, user, etc). + * @param string $object_subtype Optional object subtype (post type, taxonomy). + */ + return apply_filters( 'acf/get_object_type', $object, $object_type, $object_subtype ); +} diff --git a/includes/admin/admin-field-group.php b/includes/admin/admin-field-group.php index 40922dd5..0ef64778 100644 --- a/includes/admin/admin-field-group.php +++ b/includes/admin/admin-field-group.php @@ -180,6 +180,18 @@ function admin_enqueue_scripts() { 'copy' => __('copy', 'acf'), 'or' => __('or', 'acf'), 'Null' => __('Null', 'acf'), + + // Conditions + 'Has any value' => __('Has any value', 'acf'), + 'Has no value' => __('Has no value', 'acf'), + 'Value is equal to' => __('Value is equal to', 'acf'), + 'Value is not equal to' => __('Value is not equal to', 'acf'), + 'Value matches pattern' => __('Value matches pattern', 'acf'), + 'Value contains' => __('Value contains', 'acf'), + 'Value is greater than' => __('Value is greater than', 'acf'), + 'Value is less than' => __('Value is less than', 'acf'), + 'Selection is greater than' => __('Selection is greater than', 'acf'), + 'Selection is less than' => __('Selection is less than', 'acf'), )); // localize data diff --git a/includes/admin/admin-field-groups.php b/includes/admin/admin-field-groups.php index f9ac7d7f..89a51d0a 100644 --- a/includes/admin/admin-field-groups.php +++ b/includes/admin/admin-field-groups.php @@ -1,830 +1,879 @@ -get_admin_url( ( $this->view ? '&post_status=' . $this->view : '' ) . $params ); } /** - * maybe_redirect_edit - * - * Redirects the user from the old ACF4 edit page to the new ACF5 edit page - * - * @date 17/9/18 - * @since 5.7.6 - * - * @param void - * @return void - */ - function maybe_redirect_edit() { - if( acf_maybe_get_GET('post_type') == 'acf' ) { - wp_redirect( admin_url($this->url) ); + * Redirects users from ACF 4.0 admin page. + * + * @date 17/9/18 + * @since 5.7.6 + * + * @param void + * @return void + */ + public function handle_redirection() { + if( isset($_GET['post_type']) && $_GET['post_type'] === 'acf' ) { + wp_redirect( $this->get_admin_url() ); exit; } } - /* - * current_screen - * - * This function is fired when loading the admin page before HTML has been rendered. - * - * @type action (current_screen) - * @date 21/07/2014 - * @since 5.0.0 - * - * @param n/a - * @return n/a - */ - - function current_screen() { - - // validate screen + /** + * Constructor for the Field Groups admin page. + * + * @date 21/07/2014 + * @since 5.0.0 + * + * @param void + * @return void + */ + public function current_screen() { + + // Bail early if not Field Groups admin page. if( !acf_is_screen('edit-acf-field-group') ) { return; } - - // customize post_status - global $wp_post_statuses; + // Get the current view. + $this->view = isset( $_GET['post_status'] ) ? sanitize_text_field( $_GET['post_status'] ) : ''; + // Setup and check for custom actions.. + $this->setup_sync(); + $this->check_sync(); + $this->check_duplicate(); - // modify publish post status + // Modify publish post status text and order. + global $wp_post_statuses; $wp_post_statuses['publish']->label_count = _n_noop( 'Active (%s)', 'Active (%s)', 'acf' ); - - - // reorder trash to end $wp_post_statuses['trash'] = acf_extract_var( $wp_post_statuses, 'trash' ); - - - // check stuff - $this->check_duplicate(); - $this->check_sync(); + // Add hooks. + add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') ); + add_action( 'admin_body_class', array( $this, 'admin_body_class' ) ); + add_filter( 'views_edit-acf-field-group', array( $this, 'admin_table_views' ), 10, 1 ); + add_filter( 'manage_acf-field-group_posts_columns', array( $this, 'admin_table_columns' ), 10, 1 ); + add_action( 'manage_acf-field-group_posts_custom_column', array( $this, 'admin_table_columns_html' ), 10, 2 ); + add_filter( 'display_post_states', array( $this, 'display_post_states' ), 10, 2 ); + add_filter( 'bulk_actions-edit-acf-field-group', array( $this, 'admin_table_bulk_actions' ), 10, 1 ); + add_action( 'admin_footer', array( $this, 'admin_footer' ), 1 ); + if( $this->view !== 'trash' ) { + add_filter( 'page_row_actions', array( $this, 'page_row_actions' ), 10, 2 ); + } + + // Add hooks for "sync" view. + if( $this->view === 'sync' ) { + add_action( 'admin_footer', array( $this, 'admin_footer__sync' ), 1 ); + } + } + + /** + * Sets up the field groups ready for sync. + * + * @date 17/4/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + public function setup_sync() { + + // Review local json field groups. + if( acf_get_local_json_files() ) { + + // Get all groups in a single cached query to check if sync is available. + $all_field_groups = acf_get_field_groups(); + foreach( $all_field_groups as $field_group ) { + + // Extract vars. + $local = acf_maybe_get( $field_group, 'local' ); + $modified = acf_maybe_get( $field_group, 'modified' ); + $private = acf_maybe_get( $field_group, 'private' ); + + // Ignore if is private. + if( $private ) { + continue; + + // Ignore not local "json". + } elseif( $local !== 'json' ) { + continue; + + // Append to sync if not yet in database. + } elseif( !$field_group['ID'] ) { + $this->sync[ $field_group['key'] ] = $field_group; + + // Append to sync if "json" modified time is newer than database. + } elseif( $modified && $modified > get_post_modified_time('U', true, $field_group['ID']) ) { + $this->sync[ $field_group['key'] ] = $field_group; + } + } + } + } + + /** + * Enqueues admin scripts. + * + * @date 18/4/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + public function admin_enqueue_scripts() { + acf_enqueue_script( 'acf' ); + + // Localize text. + acf_localize_text(array( + 'Review local JSON changes' => __( 'Review local JSON changes', 'acf' ), + 'Loading diff' => __( 'Loading diff', 'acf' ), + 'Sync changes' => __( 'Sync changes', 'acf' ), + )); + } + + /** + * Modifies the admin body class. + * + * @date 18/4/20 + * @since 5.9.0 + * + * @param string $classes Space-separated list of CSS classes. + * @return string + */ + public function admin_body_class( $classes ) { + $classes .= ' acf-admin-field-groups'; + if( $this->view ) { + $classes .= " view-{$this->view}"; + } + return $classes; + } + + /** + * returns the disabled post state HTML. + * + * @date 17/4/20 + * @since 5.9.0 + * + * @param void + * @return string + */ + public function get_disabled_post_state() { + return ' ' . _x( 'Disabled', 'post status', 'acf' ); + } + + /** + * Adds the "disabled" post state for the admin table title. + * + * @date 1/4/20 + * @since 5.9.0 + * + * @param array $post_states An array of post display states. + * @param WP_Post $post The current post object. + * @return array + */ + public function display_post_states( $post_states, $post ) { + if( $post->post_status === 'acf-disabled' ) { + $post_states['acf-disabled'] = $this->get_disabled_post_state(); + } + return $post_states; + } + + /** + * Customizes the admin table columns. + * + * @date 1/4/20 + * @since 5.9.0 + * + * @param array $columns The columns array. + * @return array + */ + public function admin_table_columns( $_columns ) { + $columns = array( + 'cb' => $_columns['cb'], + 'title' => $_columns['title'], + 'acf-description' => __('Description', 'acf'), + 'acf-key' => __('Key', 'acf'), + 'acf-location' => __('Location', 'acf'), + 'acf-count' => __('Fields', 'acf'), + ); + if( acf_get_local_json_files() ) { + $columns['acf-json'] = __('Local JSON', 'acf'); + } + return $columns; + } + + /** + * Renders the admin table column HTML + * + * @date 1/4/20 + * @since 5.9.0 + * + * @param string $column_name The name of the column to display. + * @param int $post_id The current post ID. + * @return void + */ + public function admin_table_columns_html( $column_name, $post_id ) { + $field_group = acf_get_field_group( $post_id ); + if( $field_group ) { + $this->render_admin_table_column( $column_name, $field_group ); + } + } + + /** + * Renders a specific admin table column. + * + * @date 17/4/20 + * @since 5.9.0 + * + * @param string $column_name The name of the column to display. + * @param array $field_group The field group. + * @return void + */ + public function render_admin_table_column( $column_name, $field_group ) { + switch ( $column_name ) { + + // Key. + case 'acf-key': + echo esc_html( $field_group['key'] ); + break; + + // Description. + case 'acf-description': + if( $field_group['description'] ) { + echo '' . acf_esc_html( $field_group['description'] ) . ''; + } + break; + + // Location. + case 'acf-location': + $this->render_admin_table_column_locations( $field_group ); + break; + + // Count. + case 'acf-count': + echo esc_html( acf_get_field_count( $field_group ) ); + break; + + // Local JSON. + case 'acf-json': + $this->render_admin_table_column_local_status( $field_group ); + break; + } + } + + /** + * Displays a visual representation of the field group's locations. + * + * @date 1/4/20 + * @since 5.9.0 + * + * @param array $field_group The field group. + * @return void + */ + public function render_admin_table_column_locations( $field_group ) { + $objects = array(); + + // Loop over location rules and determine connected object types. + if( $field_group['location'] ) { + foreach( $field_group['location'] as $i => $rules ) { + + // Determine object types for each rule. + foreach( $rules as $j => $rule ) { + + // Get location type and subtype for the current rule. + $location = acf_get_location_rule( $rule['param'] ); + $location_object_type = ''; + $location_object_subtype = ''; + if( $location ) { + $location_object_type = $location->get_object_type( $rule ); + $location_object_subtype = $location->get_object_subtype( $rule ); + } + $rules[ $j ]['object_type'] = $location_object_type; + $rules[ $j ]['object_subtype'] = $location_object_subtype; + } + + // Now that each $rule conains object type data... + $object_types = array_column( $rules, 'object_type' ); + $object_types = array_filter( $object_types ); + $object_types = array_values( $object_types ); + if( $object_types ) { + $object_type = $object_types[0]; + } else { + continue; + } + + $object_subtypes = array_column( $rules, 'object_subtype' ); + $object_subtypes = array_filter( $object_subtypes ); + $object_subtypes = array_values( $object_subtypes ); + $object_subtypes = array_map('acf_array', $object_subtypes); + if( count($object_subtypes) > 1 ) { + $object_subtypes = call_user_func_array('array_intersect', $object_subtypes); + $object_subtypes = array_values( $object_subtypes ); + } elseif( $object_subtypes ) { + $object_subtypes = $object_subtypes[0]; + } else { + $object_subtypes = array( '' ); + } + + // Append to objects. + foreach( $object_subtypes as $object_subtype ) { + $object = acf_get_object_type( $object_type, $object_subtype ); + if( $object ) { + $objects[ $object->name ] = $object; + } + } + } + } - // actions - add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts')); - add_action('admin_footer', array($this, 'admin_footer')); - + // Reset keys. + $objects = array_values( $objects ); - // columns - add_filter('manage_edit-acf-field-group_columns', array($this, 'field_group_columns'), 10, 1); - add_action('manage_acf-field-group_posts_custom_column', array($this, 'field_group_columns_html'), 10, 2); + // Display. + $html = ''; + if( $objects ) { + $limit = 3; + $total = count( $objects ); + + // Icon. + $html .= ' '; + + // Labels. + $labels = array_column( $objects, 'label' ); + $labels = array_slice( $labels, 0, 3 ); + $html .= implode(', ', $labels ); + + // More. + if( $total > $limit ) { + $html .= ', ...'; + } + } else { + $html = ' ' . __( 'Various', 'acf' ); + } + // Filter. + echo acf_esc_html( $html ); } + /** + * Returns a human readable file location. + * + * @date 17/4/20 + * @since 5.9.0 + * + * @param string $file The full file path. + * @return string + */ + public function get_human_readable_file_location( $file ) { + + // Generate friendly file path. + $theme_path = get_stylesheet_directory(); + if( strpos($file, $theme_path) !== false ) { + $rel_file = str_replace( $theme_path, '', $file ); + $located = sprintf( __('Located in theme: %s', 'acf'), $rel_file ); + + } elseif( strpos($file, WP_PLUGIN_DIR) !== false ) { + $rel_file = str_replace( WP_PLUGIN_DIR, '', $file ); + $located = sprintf( __('Located in plugin: %s', 'acf'), $rel_file ); + + } else { + $rel_file = str_replace( ABSPATH, '', $file ); + $located = sprintf( __('Located in: %s', 'acf'), $rel_file ); + } + return $located; + } - /* - * admin_enqueue_scripts - * - * This function will add the already registered css - * - * @type function - * @date 28/09/13 - * @since 5.0.0 - * - * @param n/a - * @return n/a - */ + /** + * Displays the local JSON status of a field group. + * + * @date 14/4/20 + * @since 5.9.0 + * + * @param type $var Description. Default. + * @return type Description. + */ + public function render_admin_table_column_local_status( $field_group ) { + $json = acf_get_local_json_files(); + if( isset( $json[ $field_group['key'] ] ) ) { + $file = $json[ $field_group['key'] ]; + if( isset($this->sync[ $field_group['key'] ]) ) { + $url = $this->get_admin_url( '&acfsync=' . $field_group['key'] . '&_wpnonce=' . wp_create_nonce('bulk-posts') ); + echo '' . __( 'Sync available', 'acf' ) . ''; + if( $field_group['ID'] ) { + echo ''; + } else { + echo ''; + } + } else { + echo __( 'Saved', 'acf' ); + } + } else { + echo '' . __( 'Awaiting save', 'acf' ) . ''; + } + } - function admin_enqueue_scripts() { + /** + * Customizes the page row actions visible on hover. + * + * @date 14/4/20 + * @since 5.9.0 + * + * @param array $actions The array of actions HTML. + * @param WP_Post $post The post. + * @return array + */ + public function page_row_actions( $actions, $post ) { + + // Remove "Quick Edit" action. + unset( $actions['inline'], $actions['inline hide-if-no-js'] ); - wp_enqueue_script('acf-input'); + // Append "Duplicate" action. + $duplicate_action_url = $this->get_admin_url( '&acfduplicate=' . $post->ID . '&_wpnonce=' . wp_create_nonce('bulk-posts') ); + $actions[ 'acfduplicate' ] = '' . __( 'Duplicate', 'acf' ) . ''; + // Return actions in custom order. + $order = array( 'edit', 'acfduplicate', 'trash' ); + return array_merge( array_flip($order), $actions ); } - - /* - * check_duplicate - * - * This function will check for any $_GET data to duplicate - * - * @type function - * @date 17/10/13 - * @since 5.0.0 - * - * @param n/a - * @return n/a - */ - - function check_duplicate() { + /** + * Modifies the admin table bulk actions dropdown. + * + * @date 15/4/20 + * @since 5.9.0 + * + * @param array $actions The actions array. + * @return array + */ + public function admin_table_bulk_actions( $actions ) { + + // Add "duplicate" action. + if( $this->view !== 'sync' ) { + $actions[ 'acfduplicate' ] = __( 'Duplicate', 'acf' ); + } - // Display notice - if( $ids = acf_maybe_get_GET('acfduplicatecomplete') ) { - - // explode - $ids = explode(',', $ids); - $total = count($ids); + // Add "Sync" action. + if( $this->sync ) { + if( $this->view === 'sync' ) { + $actions = array(); + } + $actions[ 'acfsync' ] = __( 'Sync changes', 'acf' ); + } + return $actions; + } + + /** + * Checks for the custom "duplicate" action. + * + * @date 15/4/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + public function check_duplicate() { + + // Display notice on success redirect. + if( isset($_GET['acfduplicatecomplete']) ) { + $ids = array_map( 'intval', explode(',', $_GET['acfduplicatecomplete']) ); // Generate text. - $text = sprintf( _n( 'Field group duplicated.', '%s field groups duplicated.', $total, 'acf' ), $total ); + $text = sprintf( + _n( 'Field group duplicated.', '%s field groups duplicated.', count($ids), 'acf' ), + count($ids) + ); - // Add links to text. + // Append links to text. $links = array(); foreach( $ids as $id ) { $links[] = '' . get_the_title( $id ) . ''; } $text .= ' ' . implode( ', ', $links ); - // Add notice + // Add notice. acf_add_admin_notice( $text, 'success' ); + return; } - - // vars + // Find items to duplicate. $ids = array(); - - - // check single - if( $id = acf_maybe_get_GET('acfduplicate') ) { - - $ids[] = $id; - - // check multiple - } elseif( acf_maybe_get_GET('action2') === 'acfduplicate' ) { - - $ids = acf_maybe_get_GET('post'); - + if( isset($_GET['acfduplicate']) ) { + $ids[] = intval( $_GET['acfduplicate'] ); + } elseif( isset($_GET['post'], $_GET['action2']) && $_GET['action2'] === 'acfduplicate' ) { + $ids = array_map( 'intval', $_GET['post'] ); } - - // sync - if( !empty($ids) ) { - - // validate + if( $ids ) { check_admin_referer('bulk-posts'); - - // vars + // Duplicate field groups and generate array of new IDs. $new_ids = array(); - - - // loop foreach( $ids as $id ) { - - // duplicate $field_group = acf_duplicate_field_group( $id ); - - - // increase counter $new_ids[] = $field_group['ID']; - } - - // redirect - wp_redirect( admin_url( $this->url . '&acfduplicatecomplete=' . implode(',', $new_ids)) ); + // Redirect. + wp_redirect( $this->get_admin_url( '&acfduplicatecomplete=' . implode(',', $new_ids) ) ); exit; - } - } - - /* - * check_sync - * - * This function will check for any $_GET data to sync - * - * @type function - * @date 9/12/2014 - * @since 5.1.5 - * - * @param n/a - * @return n/a - */ - - function check_sync() { - - // Display notice - if( $ids = acf_maybe_get_GET('acfsynccomplete') ) { - - // explode - $ids = explode(',', $ids); - $total = count($ids); + /** + * Checks for the custom "acfsync" action. + * + * @date 15/4/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + public function check_sync() { + + // Display notice on success redirect. + if( isset($_GET['acfsynccomplete']) ) { + $ids = array_map( 'intval', explode(',', $_GET['acfsynccomplete']) ); // Generate text. - $text = sprintf( _n( 'Field group synchronised.', '%s field groups synchronised.', $total, 'acf' ), $total ); + $text = sprintf( + _n( 'Field group synchronised.', '%s field groups synchronised.', count($ids), 'acf' ), + count($ids) + ); - // Add links to text. + // Append links to text. $links = array(); foreach( $ids as $id ) { $links[] = '' . get_the_title( $id ) . ''; } $text .= ' ' . implode( ', ', $links ); - // Add notice + // Add notice. acf_add_admin_notice( $text, 'success' ); + return; } - - // vars - $groups = acf_get_field_groups(); - - - // bail early if no field groups - if( empty($groups) ) return; - - - // find JSON field groups which have not yet been imported - foreach( $groups as $group ) { - - // vars - $local = acf_maybe_get($group, 'local', false); - $modified = acf_maybe_get($group, 'modified', 0); - $private = acf_maybe_get($group, 'private', false); - - // Ignore if is private. - if( $private ) { - continue; - - // Ignore not local "json". - } elseif( $local !== 'json' ) { - continue; - - // Append to sync if not yet in database. - } elseif( !$group['ID'] ) { - $this->sync[ $group['key'] ] = $group; - - // Append to sync if "json" modified time is newer than database. - } elseif( $modified && $modified > get_post_modified_time('U', true, $group['ID'], true) ) { - $this->sync[ $group['key'] ] = $group; - } - } - - - // bail if no sync needed - if( empty($this->sync) ) return; - - - // maybe sync - $sync_keys = array(); - - - // check single - if( $key = acf_maybe_get_GET('acfsync') ) { - - $sync_keys[] = $key; - - // check multiple - } elseif( acf_maybe_get_GET('action2') === 'acfsync' ) { - - $sync_keys = acf_maybe_get_GET('post'); - + // Find items to sync. + $keys = array(); + if( isset($_GET['acfsync']) ) { + $keys[] = sanitize_text_field( $_GET['acfsync'] ); + } elseif( isset($_GET['post'], $_GET['action2']) && $_GET['action2'] === 'acfsync' ) { + $keys = array_map( 'sanitize_text_field', $_GET['post'] ); } - - // sync - if( !empty($sync_keys) ) { - - // validate + if( $keys && $this->sync ) { check_admin_referer('bulk-posts'); + // Disabled "Local JSON" controller to prevent the .json file from being modified during import. + acf_update_setting( 'json', false ); - // disable filters to ensure ACF loads raw data from DB - acf_disable_filters(); - acf_enable_filter('local'); - - - // disable JSON - // - this prevents a new JSON file being created and causing a 'change' to theme files - solves git anoyance - acf_update_setting('json', false); - - - // vars + // Sync field groups and generate array of new IDs. + $files = acf_get_local_json_files(); $new_ids = array(); - - - // loop - foreach( $sync_keys as $key ) { - - // Bail early if not found. - if( !isset($this->sync[ $key ]) ) { + foreach( $this->sync as $key => $field_group ) { + if( $field_group['key'] && in_array($field_group['key'], $keys) ) { + // Import. + } elseif( $field_group['ID'] && in_array($field_group['ID'], $keys) ) { + // Import. + } else { + // Ignore. continue; } - - // Get field group. - $field_group = $this->sync[ $key ]; - - // Append fields. - $field_group['fields'] = acf_get_fields( $field_group ); - - // Import field group. - $field_group = acf_import_field_group( $field_group ); - - // Append imported ID. - $new_ids[] = $field_group['ID']; + $local_field_group = json_decode( file_get_contents( $files[ $key ] ), true ); + $local_field_group['ID'] = $field_group['ID']; + $result = acf_import_field_group( $local_field_group ); + $new_ids[] = $result['ID']; } - - // redirect - wp_redirect( admin_url( $this->url . '&acfsynccomplete=' . implode(',', $new_ids)) ); + // Redirect. + wp_redirect( $this->get_current_admin_url( '&acfsynccomplete=' . implode(',', $new_ids) ) ); exit; - } - - - // filters - add_filter('views_edit-acf-field-group', array($this, 'list_table_views')); - } - - /* - * list_table_views - * - * This function will add an extra link for JSON in the field group list table - * - * @type function - * @date 3/12/2014 - * @since 5.1.5 - * - * @param $views (array) - * @return $views - */ - - function list_table_views( $views ) { - - // vars - $class = ''; - $total = count($this->sync); + /** + * Customizes the admin table subnav. + * + * @date 17/4/20 + * @since 5.9.0 + * + * @param array $views The available views. + * @return array + */ + public function admin_table_views( $views ) { + global $wp_list_table, $wp_query; + + // Count items. + $count = count( $this->sync ); + + // Append "sync" link to subnav. + if( $count ) { + $views['sync'] = sprintf( + '%s (%s)', + ( $this->view === 'sync' ? 'class="current"' : '' ), + esc_url( $this->get_admin_url( '&post_status=sync' ) ), + esc_html( __('Sync available', 'acf') ), + $count + ); + } - // active - if( acf_maybe_get_GET('post_status') === 'sync' ) { - - // actions - add_action('admin_footer', array($this, 'sync_admin_footer'), 5); - - - // set active class - $class = ' class="current"'; - - - // global - global $wp_list_table; - - - // update pagination + // Modify table pagination args to match JSON data. + if( $this->view === 'sync' ) { $wp_list_table->set_pagination_args( array( - 'total_items' => $total, + 'total_items' => $count, 'total_pages' => 1, - 'per_page' => $total + 'per_page' => $count )); - + $wp_query->post_count = 1; // At least one post is needed to render bulk drop-down. } - - - // add view - $views['json'] = '
+
+
+ sync as $k => $field_group ) {
+ echo '