- ',e+=i(t.children),e+="
',""+acf.escHtml(e.title)+"","
",'','","
",""]:['",'',""+acf.escHtml(e.title)+"","
"]).join("");var n,a,s=u(['',a,'
"].join(""));u("#adv-settings").length&&(n=u("#adv-settings .metabox-prefs"),a=u(['"].join("")),l(n.find("input").first(),a.find("input")),n.append(a)),u(".postbox").length&&(l(u(".postbox .handlediv").first(),s.children(".handlediv")),l(u(".postbox .hndle").first(),s.children(".hndle"))),"side"===e.position?u("#"+e.position+"-sortables").append(s):u("#"+e.position+"-sortables").prepend(s);var o=[];if(c.results.map(function(t){e.position===t.position&&u("#"+e.position+"-sortables #"+t.id).length&&o.push(t.id)}),d(e.id,o),c.sorted)for(var r in c.sorted){o=c.sorted[r].split(",");if(d(e.id,o))break}i=acf.newPostbox(e),acf.doAction("append",s),acf.doAction("append_postbox",i)}return i.showEnable(),c.visible.push(e.id),e}),acf.getPostboxes().map(function(t){-1===c.visible.indexOf(t.get("id"))&&(t.hideDisable(),c.hidden.push(t.get("id")))}),u("#acf-style").html(c.style),acf.doAction("refresh_post_screen",c)},renderUserScreen:function(t){}});new acf.Model({postEdits:{},wait:"prepare",initialize:function(){acf.isGutenberg()&&(wp.data.subscribe(acf.debounce(this.onChange).bind(this)),acf.screen.getPageTemplate=this.getPageTemplate,acf.screen.getPageParent=this.getPageParent,acf.screen.getPostType=this.getPostType,acf.screen.getPostFormat=this.getPostFormat,acf.screen.getPostCoreTerms=this.getPostCoreTerms,acf.unload.disable(),5.3<=parseFloat(acf.get("wp_version"))&&this.addAction("refresh_post_screen",this.onRefreshPostScreen),wp.domReady(acf.refresh))},onChange:function(){var e=["template","parent","format"];(wp.data.select("core").getTaxonomies()||[]).map(function(t){e.push(t.rest_base)});var i=wp.data.select("core/editor").getPostEdits(),n={};e.map(function(t){void 0!==i[t]&&(n[t]=i[t])}),JSON.stringify(n)!==JSON.stringify(this.postEdits)&&(this.postEdits=n,acf.screen.check())},getPageTemplate:function(){return wp.data.select("core/editor").getEditedPostAttribute("template")},getPageParent:function(t,e){return wp.data.select("core/editor").getEditedPostAttribute("parent")},getPostType:function(){return wp.data.select("core/editor").getEditedPostAttribute("type")},getPostFormat:function(t,e){return wp.data.select("core/editor").getEditedPostAttribute("format")},getPostCoreTerms:function(){var i={};return(wp.data.select("core").getTaxonomies()||[]).map(function(t){var e=wp.data.select("core/editor").getEditedPostAttribute(t.rest_base);e&&(i[t.slug]=e)}),i},onRefreshPostScreen:function(e){var i=wp.data.select("core/edit-post"),t=wp.data.dispatch("core/edit-post"),n={};i.getActiveMetaBoxLocations().map(function(t){n[t]=i.getMetaBoxesPerLocation(t)});var a,s=[];for(a in n)n[a].map(function(t){s.push(t.id)});for(a in e.results.filter(function(t){return-1===s.indexOf(t.id)}).map(function(t,e){var i=t.position;n[i]=n[i]||[],n[i].push({id:t.id,title:t.title})}),n)n[a]=n[a].filter(function(t){return-1===e.hidden.indexOf(t.id)});t.setAvailableMetaBoxesPerLocation(n)}})}(jQuery),function(l){function n(){return acf.isset(window,"jQuery","fn","select2","amd")?4:!!acf.isset(window,"Select2")&&3}acf.newSelect2=function(t,e){return e=acf.parseArgs(e,{allowNull:!1,placeholder:"",multiple:!1,field:!1,ajax:!1,ajaxAction:"",ajaxData:function(t){return t},ajaxResults:function(t){return t}}),e=new(4==n()?a:s)(t,e),acf.doAction("new_select2",e),e};var i=acf.Model.extend({setup:function(t,e){l.extend(this.data,e),this.$el=t},initialize:function(){},selectOption:function(t){t=this.getOption(t);t.prop("selected")||t.prop("selected",!0).trigger("change")},unselectOption:function(t){t=this.getOption(t);t.prop("selected")&&t.prop("selected",!1).trigger("change")},getOption:function(t){return this.$('option[value="'+t+'"]')},addOption:function(t){t=acf.parseArgs(t,{id:"",text:"",selected:!1});var e=this.getOption(t.id);return e.length||((e=l("")).html(t.text),e.attr("value",t.id),e.prop("selected",t.selected),this.$el.append(e)),e},getValue:function(){var e=[],t=this.$el.find("option:selected");return t.exists()&&(t=t.sort(function(t,e){return+t.getAttribute("data-i")-+e.getAttribute("data-i")})).each(function(){var t=l(this);e.push({$el:t,id:t.attr("value"),text:t.text()})}),e},mergeOptions:function(){},getChoices:function(){var i=function(t){var e=[];return t.children().each(function(){var t=l(this);t.is("optgroup")?e.push({text:t.attr("label"),children:i(t)}):e.push({id:t.attr("value"),text:t.text()})}),e};return i(this.$el)},getAjaxData:function(t){var e={action:this.get("ajaxAction"),s:t.term||"",paged:t.page||1},i=this.get("field");i&&(e.field_key=i.get("key"));var n=this.get("ajaxData");return n&&(e=n.apply(this,[e,t])),e=acf.applyFilters("select2_ajax_data",e,this.data,this.$el,i||!1,this),acf.prepareForAjax(e)},getAjaxResults:function(t,e){t=acf.parseArgs(t,{results:!1,more:!1});var i=this.get("ajaxResults");return i&&(t=i.apply(this,[t,e])),t=acf.applyFilters("select2_ajax_results",t,e,this)},processAjaxResults:function(t,e){return(t=this.getAjaxResults(t,e)).more&&(t.pagination={more:!0}),setTimeout(l.proxy(this.mergeOptions,this),1),t},destroy:function(){this.$el.data("select2")&&this.$el.select2("destroy"),this.$el.siblings(".select2-container").remove()}}),a=i.extend({initialize:function(){var e=this.$el;(n={width:"100%",allowClear:this.get("allowNull"),placeholder:this.get("placeholder"),multiple:this.get("multiple"),data:[],escapeMarkup:function(t){return acf.escHtml(t)}}).multiple&&this.getValue().map(function(t){t.$el.detach().appendTo(e)});var t=e.attr("data-ajax");void 0!==t&&(e.removeData("ajax"),e.removeAttr("data-ajax")),this.get("ajax")&&(n.ajax={url:acf.get("ajaxurl"),delay:250,dataType:"json",type:"post",cache:!1,data:l.proxy(this.getAjaxData,this),processResults:l.proxy(this.processAjaxResults,this)});var i=this.get("field"),n=acf.applyFilters("select2_args",n,e,this.data,i||!1,this);e.select2(n);var a,s=e.next(".select2-container");n.multiple&&((a=s.find("ul")).sortable({stop:function(t){a.find(".select2-selection__choice").each(function(){l(l(this).data("data").element).detach().appendTo(e)}),e.trigger("change")}}),e.on("select2:select",this.proxy(function(t){this.getOption(t.params.data.id).detach().appendTo(this.$el)}))),s.addClass("-acf"),void 0!==t&&e.attr("data-ajax",t),acf.doAction("select2_init",e,n,this.data,i||!1,this)},mergeOptions:function(){var i=!1,n=!1;l('.select2-results__option[role="group"]').each(function(){var t=l(this).children("ul"),e=l(this).children("strong");if(n&&n.text()===e.text())return i.append(t.children()),void l(this).remove();i=t,n=e})}}),s=i.extend({initialize:function(){var i=this.$el,n=this.getValue(),a=this.get("multiple"),t={width:"100%",allowClear:this.get("allowNull"),placeholder:this.get("placeholder"),separator:"||",multiple:this.get("multiple"),data:this.getChoices(),escapeMarkup:function(t){return acf.escHtml(t)},dropdownCss:{"z-index":"999999999"},initSelection:function(t,e){e(a?n:n.shift())}},e=i.siblings("input");e.length||(e=l(''),i.before(e)),inputValue=n.map(function(t){return t.id}).join("||"),e.val(inputValue),t.multiple&&n.map(function(t){t.$el.detach().appendTo(i)}),t.allowClear&&(t.data=t.data.filter(function(t){return""!==t.id})),i.removeData("ajax"),i.removeAttr("data-ajax"),this.get("ajax")&&(t.ajax={url:acf.get("ajaxurl"),quietMillis:250,dataType:"json",type:"post",cache:!1,data:l.proxy(this.getAjaxData,this),results:l.proxy(this.processAjaxResults,this)});var s=this.get("field"),t=acf.applyFilters("select2_args",t,i,this.data,s||!1,this);e.select2(t);var o,r=e.select2("container"),c=l.proxy(this.getOption,this);t.multiple&&(o=r.find("ul")).sortable({stop:function(){o.find(".select2-search-choice").each(function(){var t=l(this).data("select2Data");c(t.id).detach().appendTo(i)}),i.trigger("change")}}),e.on("select2-selecting",function(t){var e=t.choice,t=c(e.id);(t=!t.length?l('"):t).detach().appendTo(i)}),r.addClass("-acf"),acf.doAction("select2_init",i,t,this.data,s||!1,this),e.on("change",function(){var t=e.val();t.indexOf("||")&&(t=t.split("||")),i.val(t).trigger("change")}),i.hide()},mergeOptions:function(){var i=!1;l("#select2-drop .select2-result-with-children").each(function(){var t=l(this).children("ul"),e=l(this).children(".select2-result-label");if(i&&i.text()===e.text())return i.append(t.children()),void l(this).remove();i=e})},getAjaxData:function(t,e){return i.prototype.getAjaxData.apply(this,[{term:t,page:e}])}});new acf.Model({priority:5,wait:"prepare",actions:{duplicate:"onDuplicate"},initialize:function(){var t=acf.get("locale"),e=(acf.get("rtl"),acf.get("select2L10n")),i=n();return!!e&&(0!==t.indexOf("en")&&void(4==i?this.addTranslations4():3==i&&this.addTranslations3()))},addTranslations4:function(){var e=acf.get("select2L10n"),t=(t=acf.get("locale")).replace("_","-"),i={errorLoading:function(){return e.load_fail},inputTooLong:function(t){t=t.input.length-t.maximum;return 1',e.html,"
","- ',e+=i(t.children),e+="
',""+acf.escHtml(e.title)+"","
",'','","
",""]:['",'',""+acf.escHtml(e.title)+"","
"]).join("");var n,a,s=u(['',a,'
"].join(""));u("#adv-settings").length&&(n=u("#adv-settings .metabox-prefs"),a=u(['"].join("")),l(n.find("input").first(),a.find("input")),n.append(a)),u(".postbox").length&&(l(u(".postbox .handlediv").first(),s.children(".handlediv")),l(u(".postbox .hndle").first(),s.children(".hndle"))),"side"===e.position?u("#"+e.position+"-sortables").append(s):u("#"+e.position+"-sortables").prepend(s);var o=[];if(c.results.map(function(t){e.position===t.position&&u("#"+e.position+"-sortables #"+t.id).length&&o.push(t.id)}),d(e.id,o),c.sorted)for(var r in c.sorted){o=c.sorted[r].split(",");if(d(e.id,o))break}i=acf.newPostbox(e),acf.doAction("append",s),acf.doAction("append_postbox",i)}return i.showEnable(),c.visible.push(e.id),e}),acf.getPostboxes().map(function(t){-1===c.visible.indexOf(t.get("id"))&&(t.hideDisable(),c.hidden.push(t.get("id")))}),u("#acf-style").html(c.style),acf.doAction("refresh_post_screen",c)},renderUserScreen:function(t){}});new acf.Model({postEdits:{},wait:"prepare",initialize:function(){acf.isGutenberg()&&(wp.data.subscribe(acf.debounce(this.onChange).bind(this)),acf.screen.getPageTemplate=this.getPageTemplate,acf.screen.getPageParent=this.getPageParent,acf.screen.getPostType=this.getPostType,acf.screen.getPostFormat=this.getPostFormat,acf.screen.getPostCoreTerms=this.getPostCoreTerms,acf.unload.disable(),5.3<=parseFloat(acf.get("wp_version"))&&this.addAction("refresh_post_screen",this.onRefreshPostScreen),wp.domReady(acf.refresh))},onChange:function(){var e=["template","parent","format"];(wp.data.select("core").getTaxonomies()||[]).map(function(t){e.push(t.rest_base)});var i=wp.data.select("core/editor").getPostEdits(),n={};e.map(function(t){void 0!==i[t]&&(n[t]=i[t])}),JSON.stringify(n)!==JSON.stringify(this.postEdits)&&(this.postEdits=n,acf.screen.check())},getPageTemplate:function(){return wp.data.select("core/editor").getEditedPostAttribute("template")},getPageParent:function(t,e){return wp.data.select("core/editor").getEditedPostAttribute("parent")},getPostType:function(){return wp.data.select("core/editor").getEditedPostAttribute("type")},getPostFormat:function(t,e){return wp.data.select("core/editor").getEditedPostAttribute("format")},getPostCoreTerms:function(){var i={};return(wp.data.select("core").getTaxonomies()||[]).map(function(t){var e=wp.data.select("core/editor").getEditedPostAttribute(t.rest_base);e&&(i[t.slug]=e)}),i},onRefreshPostScreen:function(e){var i=wp.data.select("core/edit-post"),t=wp.data.dispatch("core/edit-post"),n={};i.getActiveMetaBoxLocations().map(function(t){n[t]=i.getMetaBoxesPerLocation(t)});var a,s=[];for(a in n)n[a].map(function(t){s.push(t.id)});for(a in e.results.filter(function(t){return-1===s.indexOf(t.id)}).map(function(t,e){var i=t.position;n[i]=n[i]||[],n[i].push({id:t.id,title:t.title})}),n)n[a]=n[a].filter(function(t){return-1===e.hidden.indexOf(t.id)});t.setAvailableMetaBoxesPerLocation(n)}})}(jQuery),function(l){function n(){return acf.isset(window,"jQuery","fn","select2","amd")?4:!!acf.isset(window,"Select2")&&3}acf.newSelect2=function(t,e){return e=acf.parseArgs(e,{allowNull:!1,placeholder:"",multiple:!1,field:!1,ajax:!1,ajaxAction:"",ajaxData:function(t){return t},ajaxResults:function(t){return t}}),e=new(4==n()?a:s)(t,e),acf.doAction("new_select2",e),e};var i=acf.Model.extend({setup:function(t,e){l.extend(this.data,e),this.$el=t},initialize:function(){},selectOption:function(t){t=this.getOption(t);t.prop("selected")||t.prop("selected",!0).trigger("change")},unselectOption:function(t){t=this.getOption(t);t.prop("selected")&&t.prop("selected",!1).trigger("change")},getOption:function(t){return this.$('option[value="'+t+'"]')},addOption:function(t){t=acf.parseArgs(t,{id:"",text:"",selected:!1});var e=this.getOption(t.id);return e.length||((e=l("")).html(t.text),e.attr("value",t.id),e.prop("selected",t.selected),this.$el.append(e)),e},getValue:function(){var e=[],t=this.$el.find("option:selected");return t.exists()&&(t=t.sort(function(t,e){return+t.getAttribute("data-i")-+e.getAttribute("data-i")})).each(function(){var t=l(this);e.push({$el:t,id:t.attr("value"),text:t.text()})}),e},mergeOptions:function(){},getChoices:function(){var i=function(t){var e=[];return t.children().each(function(){var t=l(this);t.is("optgroup")?e.push({text:t.attr("label"),children:i(t)}):e.push({id:t.attr("value"),text:t.text()})}),e};return i(this.$el)},getAjaxData:function(t){var e={action:this.get("ajaxAction"),s:t.term||"",paged:t.page||1},i=this.get("field");i&&(e.field_key=i.get("key"));var n=this.get("ajaxData");return n&&(e=n.apply(this,[e,t])),e=acf.applyFilters("select2_ajax_data",e,this.data,this.$el,i||!1,this),acf.prepareForAjax(e)},getAjaxResults:function(t,e){t=acf.parseArgs(t,{results:!1,more:!1});var i=this.get("ajaxResults");return i&&(t=i.apply(this,[t,e])),t=acf.applyFilters("select2_ajax_results",t,e,this)},processAjaxResults:function(t,e){return(t=this.getAjaxResults(t,e)).more&&(t.pagination={more:!0}),setTimeout(l.proxy(this.mergeOptions,this),1),t},destroy:function(){this.$el.data("select2")&&this.$el.select2("destroy"),this.$el.siblings(".select2-container").remove()}}),a=i.extend({initialize:function(){var e=this.$el,t={width:"100%",allowClear:this.get("allowNull"),placeholder:this.get("placeholder"),multiple:this.get("multiple"),data:[],escapeMarkup:function(t){return"string"!=typeof t?t:acf.escHtml(t)}};acf.isset(window,"jQuery","fn","selectWoo")||(t.templateSelection=function(t){var e=l('');return e.html(acf.escHtml(t.text)),e.data("element",t.element),e}),t.multiple&&this.getValue().map(function(t){t.$el.detach().appendTo(e)});var i=e.attr("data-ajax");void 0!==i&&(e.removeData("ajax"),e.removeAttr("data-ajax")),this.get("ajax")&&(t.ajax={url:acf.get("ajaxurl"),delay:250,dataType:"json",type:"post",cache:!1,data:l.proxy(this.getAjaxData,this),processResults:l.proxy(this.processAjaxResults,this)});var n=this.get("field"),t=acf.applyFilters("select2_args",t,e,this.data,n||!1,this);e.select2(t);var a,s=e.next(".select2-container");t.multiple&&((a=s.find("ul")).sortable({stop:function(t){a.find(".select2-selection__choice").each(function(){(l(this).data("data")?l(l(this).data("data").element):l(l(this).children("span.acf-selection").data("element"))).detach().appendTo(e)}),e.trigger("change")}}),e.on("select2:select",this.proxy(function(t){this.getOption(t.params.data.id).detach().appendTo(this.$el)}))),s.addClass("-acf"),void 0!==i&&e.attr("data-ajax",i),acf.doAction("select2_init",e,t,this.data,n||!1,this)},mergeOptions:function(){var i=!1,n=!1;l('.select2-results__option[role="group"]').each(function(){var t=l(this).children("ul"),e=l(this).children("strong");if(n&&n.text()===e.text())return i.append(t.children()),void l(this).remove();i=t,n=e})}}),s=i.extend({initialize:function(){var i=this.$el,n=this.getValue(),a=this.get("multiple"),t={width:"100%",allowClear:this.get("allowNull"),placeholder:this.get("placeholder"),separator:"||",multiple:this.get("multiple"),data:this.getChoices(),escapeMarkup:function(t){return acf.escHtml(t)},dropdownCss:{"z-index":"999999999"},initSelection:function(t,e){e(a?n:n.shift())}},e=i.siblings("input");e.length||(e=l(''),i.before(e)),inputValue=n.map(function(t){return t.id}).join("||"),e.val(inputValue),t.multiple&&n.map(function(t){t.$el.detach().appendTo(i)}),t.allowClear&&(t.data=t.data.filter(function(t){return""!==t.id})),i.removeData("ajax"),i.removeAttr("data-ajax"),this.get("ajax")&&(t.ajax={url:acf.get("ajaxurl"),quietMillis:250,dataType:"json",type:"post",cache:!1,data:l.proxy(this.getAjaxData,this),results:l.proxy(this.processAjaxResults,this)});var s=this.get("field"),t=acf.applyFilters("select2_args",t,i,this.data,s||!1,this);e.select2(t);var o,r=e.select2("container"),c=l.proxy(this.getOption,this);t.multiple&&(o=r.find("ul")).sortable({stop:function(){o.find(".select2-search-choice").each(function(){var t=l(this).data("select2Data");c(t.id).detach().appendTo(i)}),i.trigger("change")}}),e.on("select2-selecting",function(t){var e=t.choice,t=c(e.id);(t=!t.length?l('"):t).detach().appendTo(i)}),r.addClass("-acf"),acf.doAction("select2_init",i,t,this.data,s||!1,this),e.on("change",function(){var t=e.val();t.indexOf("||")&&(t=t.split("||")),i.val(t).trigger("change")}),i.hide()},mergeOptions:function(){var i=!1;l("#select2-drop .select2-result-with-children").each(function(){var t=l(this).children("ul"),e=l(this).children(".select2-result-label");if(i&&i.text()===e.text())return i.append(t.children()),void l(this).remove();i=e})},getAjaxData:function(t,e){return i.prototype.getAjaxData.apply(this,[{term:t,page:e}])}});new acf.Model({priority:5,wait:"prepare",actions:{duplicate:"onDuplicate"},initialize:function(){var t=acf.get("locale"),e=(acf.get("rtl"),acf.get("select2L10n")),i=n();return!!e&&(0!==t.indexOf("en")&&void(4==i?this.addTranslations4():3==i&&this.addTranslations3()))},addTranslations4:function(){var e=acf.get("select2L10n"),t=(t=acf.get("locale")).replace("_","-"),i={errorLoading:function(){return e.load_fail},inputTooLong:function(t){t=t.input.length-t.maximum;return 1',e.html,"
","' . __( 'Move Complete.', 'acf' ) . '
' . - '' . sprintf( - acf_punctify( __( 'The %s field can now be found in the %s field group', 'acf' ) ), - esc_html( $field['label'] ), - $link - ). '
' . - '' . __( 'Close Window', 'acf' ) . ''; + + + /* + * mb_options + * + * This function will render the HTML for the medtabox 'acf-field-group-options' + * + * @type function + * @date 28/09/13 + * @since 5.0.0 + * + * @param N/A + * @return N/A + */ + + function mb_options() { + + // global + global $field_group; + + // field key (leave in for compatibility) + if ( ! acf_is_field_group_key( $field_group['key'] ) ) { + + $field_group['key'] = uniqid( 'group_' ); + + } + + // view + acf_get_view( 'field-group-options' ); + + } + + + /* + * mb_locations + * + * This function will render the HTML for the medtabox 'acf-field-group-locations' + * + * @type function + * @date 28/09/13 + * @since 5.0.0 + * + * @param N/A + * @return N/A + */ + + function mb_locations() { + + // global + global $field_group; + + // UI needs at lease 1 location rule + if ( empty( $field_group['location'] ) ) { + + $field_group['location'] = array( + + // group 0 + array( + + // rule 0 + array( + 'param' => 'post_type', + 'operator' => '==', + 'value' => 'post', + ), + ), + + ); + } + + // view + acf_get_view( 'field-group-locations' ); + + } + + + /* + * ajax_render_location_rule + * + * This function can be accessed via an AJAX action and will return the result from the render_location_value function + * + * @type function (ajax) + * @date 30/09/13 + * @since 5.0.0 + * + * @param n/a + * @return n/a + */ + + function ajax_render_location_rule() { + + // validate + if ( ! acf_verify_ajax() ) { + die(); + } + + // verify user capability + if ( ! acf_current_user_can_admin() ) { + die(); + } + + // validate rule + $rule = acf_validate_location_rule( $_POST['rule'] ); + + // view + acf_get_view( + 'html-location-rule', + array( + 'rule' => $rule, + ) + ); + + // die die(); } - - - // get all field groups - $field_groups = acf_get_field_groups(); - $choices = array(); - - - // check - if( !empty($field_groups) ) { - - // loop - foreach( $field_groups as $field_group ) { - - // bail early if no ID - if( !$field_group['ID'] ) continue; - - - // bail ealry if is current - if( $field_group['ID'] == $args['post_id'] ) continue; - - - // append - $choices[ $field_group['ID'] ] = $field_group['title']; - - } - - } - - - // render options - $field = acf_get_valid_field(array( - 'type' => 'select', - 'name' => 'acf_field_group', - 'choices' => $choices - )); - - - echo '' . __('Please select the destination for this field', 'acf') . '
'; - - echo ''; - - - // die - die(); - - } - -} -// initialize -new acf_admin_field_group(); + + /* + * ajax_render_field_settings + * + * This function will return HTML containing the field's settings based on it's new type + * + * @type function (ajax) + * @date 30/09/13 + * @since 5.0.0 + * + * @param n/a + * @return n/a + */ + + function ajax_render_field_settings() { + + // validate + if ( ! acf_verify_ajax() ) { + die(); + } + + // verify user capability + if ( ! acf_current_user_can_admin() ) { + die(); + } + + // vars + $field = acf_maybe_get_POST( 'field' ); + + // check + if ( ! $field ) { + die(); + } + + // set prefix + $field['prefix'] = acf_maybe_get_POST( 'prefix' ); + + // validate + $field = acf_get_valid_field( $field ); + + // render + do_action( "acf/render_field_settings/type={$field['type']}", $field ); + + // return + die(); + + } + + /* + * ajax_move_field + * + * description + * + * @type function + * @date 20/01/2014 + * @since 5.0.0 + * + * @param $post_id (int) + * @return $post_id (int) + */ + + function ajax_move_field() { + + // disable filters to ensure ACF loads raw data from DB + acf_disable_filters(); + + $args = acf_parse_args( + $_POST, + array( + 'nonce' => '', + 'post_id' => 0, + 'field_id' => 0, + 'field_group_id' => 0, + ) + ); + + // verify nonce + if ( ! wp_verify_nonce( $args['nonce'], 'acf_nonce' ) ) { + die(); + } + + // verify user capability + if ( ! acf_current_user_can_admin() ) { + die(); + } + + // confirm? + if ( $args['field_id'] && $args['field_group_id'] ) { + + // vars + $field = acf_get_field( $args['field_id'] ); + $field_group = acf_get_field_group( $args['field_group_id'] ); + + // update parent + $field['parent'] = $field_group['ID']; + + // remove conditional logic + $field['conditional_logic'] = 0; + + // update field + acf_update_field( $field ); + + // Output HTML. + $link = '' . esc_html( $field_group['title'] ) . ''; + + echo '' . + '' . __( 'Move Complete.', 'acf' ) . '
' . + '' . sprintf( + acf_punctify( __( 'The %1$s field can now be found in the %2$s field group', 'acf' ) ), + esc_html( $field['label'] ), + $link + ) . '
' . + '' . __( 'Close Window', 'acf' ) . ''; + die(); + } + + // get all field groups + $field_groups = acf_get_field_groups(); + $choices = array(); + + // check + if ( ! empty( $field_groups ) ) { + + // loop + foreach ( $field_groups as $field_group ) { + + // bail early if no ID + if ( ! $field_group['ID'] ) { + continue; + } + + // bail ealry if is current + if ( $field_group['ID'] == $args['post_id'] ) { + continue; + } + + // append + $choices[ $field_group['ID'] ] = $field_group['title']; + + } + } + + // render options + $field = acf_get_valid_field( + array( + 'type' => 'select', + 'name' => 'acf_field_group', + 'choices' => $choices, + ) + ); + + echo '' . __( 'Please select the destination for this field', 'acf' ) . '
'; + + echo ''; + + // die + die(); + + } + + } + + // initialize + new acf_admin_field_group(); endif; -?> \ No newline at end of file +?> diff --git a/includes/admin/admin-field-groups.php b/includes/admin/admin-field-groups.php index 89a51d0..a8b5575 100644 --- a/includes/admin/admin-field-groups.php +++ b/includes/admin/admin-field-groups.php @@ -1,713 +1,719 @@ -get_admin_url( ( $this->view ? '&post_status=' . $this->view : '' ) . $params ); - } - - /** - * 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; - } - } - - /** - * 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; - } - - // 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 text and order. - global $wp_post_statuses; - $wp_post_statuses['publish']->label_count = _n_noop( 'Active (%s)', 'Active (%s)', 'acf' ); - $wp_post_statuses['trash'] = acf_extract_var( $wp_post_statuses, 'trash' ); - - // 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 ); + /** + * Array of field groups availbale for sync. + * + * @since 5.9.0 + * @var array + */ + public $sync = array(); + + /** + * The current view (post_status). + * + * @since 5.9.0 + * @var string + */ + public $view = ''; + + /** + * Constructor. + * + * @date 5/03/2014 + * @since 5.0.0 + * + * @param void + * @return void + */ + public function __construct() { + + // Add hooks. + add_action( 'load-edit.php', array( $this, 'handle_redirection' ) ); + add_action( 'current_screen', array( $this, 'current_screen' ) ); + + // Handle post status change events. + add_action( 'trashed_post', array( $this, 'trashed_post' ) ); + add_action( 'untrashed_post', array( $this, 'untrashed_post' ) ); + add_action( 'deleted_post', array( $this, 'deleted_post' ) ); } - // Add hooks for "sync" view. - if( $this->view === 'sync' ) { - add_action( 'admin_footer', array( $this, 'admin_footer__sync' ), 1 ); + /** + * Returns the Field Groups admin URL. + * + * @date 27/3/20 + * @since 5.9.0 + * + * @param string $params Extra URL params. + * @return string + */ + public function get_admin_url( $params = '' ) { + return admin_url( "edit.php?post_type=acf-field-group{$params}" ); } - } - - /** - * 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; + + /** + * Returns the Field Groups admin URL taking into account the current view. + * + * @date 27/3/20 + * @since 5.9.0 + * + * @param string $params Extra URL params. + * @return string + */ + public function get_current_admin_url( $params = '' ) { + return $this->get_admin_url( ( $this->view ? '&post_status=' . $this->view : '' ) . $params ); + } + + /** + * 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; + } + } + + /** + * 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; + } + + // 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 text and order. + global $wp_post_statuses; + $wp_post_statuses['publish']->label_count = _n_noop( 'Active (%s)', 'Active (%s)', 'acf' ); + $wp_post_statuses['trash'] = acf_extract_var( $wp_post_statuses, 'trash' ); + + // 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}"; + + /** + * 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' ), + ) + ); } - 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(); + + /** + * 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; } - 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'); + + /** + * 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' ); } - 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 ); + + /** + * 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; } - } - - /** - * 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; + + /** + * 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; } - } - - /** - * 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 ); + + /** + * 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'] ) . ''; } - $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); + 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 ); - } 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; + $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; + } } } } - } - - // Reset keys. - $objects = array_values( $objects ); - - // 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; - } - - /** - * 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 ''; + + // Reset keys. + $objects = array_values( $objects ); + + // 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 { - echo __( 'Saved', 'acf' ); + $html = ' ' . __( 'Various', 'acf' ); } - } else { - echo '' . __( 'Awaiting save', 'acf' ) . ''; - } - } - - /** - * 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'] ); - - // 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 ); - } - - /** - * 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' ); + // Filter. + echo acf_esc_html( $html ); } - - // Add "Sync" action. - if( $this->sync ) { - if( $this->view === 'sync' ) { - $actions = array(); + + /** + * 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 ); } - $actions[ 'acfsync' ] = __( 'Sync changes', 'acf' ); + return $located; } - 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.', count($ids), 'acf' ), - count($ids) - ); - - // Append links to text. - $links = array(); - foreach( $ids as $id ) { - $links[] = '' . get_the_title( $id ) . ''; - } - $text .= ' ' . implode( ', ', $links ); - - // Add notice. - acf_add_admin_notice( $text, 'success' ); - return; - } - - // Find items to duplicate. - $ids = array(); - if( isset($_GET['acfduplicate']) ) { - $ids[] = intval( $_GET['acfduplicate'] ); - } elseif( isset($_GET['post'], $_GET['action2']) && $_GET['action2'] === 'acfduplicate' ) { - $ids = array_map( 'intval', $_GET['post'] ); - } - - if( $ids ) { - check_admin_referer('bulk-posts'); - - // Duplicate field groups and generate array of new IDs. - $new_ids = array(); - foreach( $ids as $id ) { - $field_group = acf_duplicate_field_group( $id ); - $new_ids[] = $field_group['ID']; - } - - // Redirect. - wp_redirect( $this->get_admin_url( '&acfduplicatecomplete=' . implode(',', $new_ids) ) ); - exit; - } - } - - /** - * 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.', count($ids), 'acf' ), - count($ids) - ); - - // Append links to text. - $links = array(); - foreach( $ids as $id ) { - $links[] = '' . get_the_title( $id ) . ''; - } - $text .= ' ' . implode( ', ', $links ); - - // Add notice. - acf_add_admin_notice( $text, 'success' ); - return; - } - - // 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'] ); - } - - 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 ); - - // Sync field groups and generate array of new IDs. - $files = acf_get_local_json_files(); - $new_ids = array(); - 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. + + /** + * 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 { - // Ignore. - continue; + echo __( 'Saved', 'acf' ); } - $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']; + } else { + echo '' . __( 'Awaiting save', 'acf' ) . ''; } - - // Redirect. - wp_redirect( $this->get_current_admin_url( '&acfsynccomplete=' . implode(',', $new_ids) ) ); - exit; } - } - - /** - * 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 - ); + + /** + * 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'] ); + + // 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 ); } - - // Modify table pagination args to match JSON data. - if( $this->view === 'sync' ) { - $wp_list_table->set_pagination_args( array( - 'total_items' => $count, - 'total_pages' => 1, - 'per_page' => $count - )); - $wp_query->post_count = 1; // At least one post is needed to render bulk drop-down. + + /** + * 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' ); + } + + // Add "Sync" action. + if ( $this->sync ) { + if ( $this->view === 'sync' ) { + $actions = array(); + } + $actions['acfsync'] = __( 'Sync changes', 'acf' ); + } + return $actions; } - return $views; - } - - /** - * Prints scripts into the admin footer. - * - * @date 20/4/20 - * @since 5.9.0 - * - * @param void - * @return void - */ - function admin_footer() { - ?> + + /** + * 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.', count( $ids ), 'acf' ), + count( $ids ) + ); + + // Append links to text. + $links = array(); + foreach ( $ids as $id ) { + $links[] = '' . get_the_title( $id ) . ''; + } + $text .= ' ' . implode( ', ', $links ); + + // Add notice. + acf_add_admin_notice( $text, 'success' ); + return; + } + + // Find items to duplicate. + $ids = array(); + if ( isset( $_GET['acfduplicate'] ) ) { + $ids[] = intval( $_GET['acfduplicate'] ); + } elseif ( isset( $_GET['post'], $_GET['action2'] ) && $_GET['action2'] === 'acfduplicate' ) { + $ids = array_map( 'intval', $_GET['post'] ); + } + + if ( $ids ) { + check_admin_referer( 'bulk-posts' ); + + // Duplicate field groups and generate array of new IDs. + $new_ids = array(); + foreach ( $ids as $id ) { + $field_group = acf_duplicate_field_group( $id ); + $new_ids[] = $field_group['ID']; + } + + // Redirect. + wp_redirect( $this->get_admin_url( '&acfduplicatecomplete=' . implode( ',', $new_ids ) ) ); + exit; + } + } + + /** + * 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.', count( $ids ), 'acf' ), + count( $ids ) + ); + + // Append links to text. + $links = array(); + foreach ( $ids as $id ) { + $links[] = '' . get_the_title( $id ) . ''; + } + $text .= ' ' . implode( ', ', $links ); + + // Add notice. + acf_add_admin_notice( $text, 'success' ); + return; + } + + // 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'] ); + } + + 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 ); + + // Sync field groups and generate array of new IDs. + $files = acf_get_local_json_files(); + $new_ids = array(); + 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; + } + $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( $this->get_current_admin_url( '&acfsynccomplete=' . implode( ',', $new_ids ) ) ); + exit; + } + } + + /** + * 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 + ); + } + + // Modify table pagination args to match JSON data. + if ( $this->view === 'sync' ) { + $wp_list_table->set_pagination_args( + array( + 'total_items' => $count, + 'total_pages' => 1, + 'per_page' => $count, + ) + ); + $wp_query->post_count = 1; // At least one post is needed to render bulk drop-down. + } + return $views; + } + + /** + * Prints scripts into the admin footer. + * + * @date 20/4/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + function admin_footer() { + ?> - get_columns(); - $hidden = get_hidden_columns( $wp_list_table->screen ); - ?> + get_columns(); + $hidden = get_hidden_columns( $wp_list_table->screen ); + ?>%s
',
- esc_attr( $notice_type ),
- $is_dismissible ? 'is-dismissible' : '',
- acf_esc_html( wpautop( acf_punctify( $notice_text ) ) )
+ class ACF_Admin_Notice extends ACF_Data {
+
+ /** @var array Storage for data. */
+ var $data = array(
+
+ /** @type string Text displayed in notice. */
+ 'text' => '',
+
+ /** @type string The type of notice (warning, error, success, info). */
+ 'type' => 'info',
+
+ /** @type bool If the notice can be dismissed. */
+ 'dismissible' => true,
);
+
+ /**
+ * render
+ *
+ * Renders the notice HTML.
+ *
+ * @date 27/12/18
+ * @since 5.8.0
+ *
+ * @param void
+ * @return void
+ */
+ function render() {
+ $notice_text = $this->get( 'text' );
+ $notice_type = $this->get( 'type' );
+ $is_dismissible = $this->get( 'dismissible' );
+
+ printf(
+ '%s
',
+ esc_attr( $notice_type ),
+ $is_dismissible ? 'is-dismissible' : '',
+ acf_esc_html( wpautop( acf_punctify( $notice_text ) ) )
+ );
+ }
}
-}
endif; // class_exists check
/**
-* acf_new_admin_notice
-*
-* Instantiates and returns a new model.
-*
-* @date 23/12/18
-* @since 5.8.0
-*
-* @param array $data Optional data to set.
-* @return ACF_Admin_Notice
-*/
+ * acf_new_admin_notice
+ *
+ * Instantiates and returns a new model.
+ *
+ * @date 23/12/18
+ * @since 5.8.0
+ *
+ * @param array $data Optional data to set.
+ * @return ACF_Admin_Notice
+ */
function acf_new_admin_notice( $data = false ) {
-
+
// Create notice.
$instance = new ACF_Admin_Notice( $data );
-
+
// Register notice.
acf_get_store( 'notices' )->set( $instance->cid, $instance );
-
+
// Return notice.
return $instance;
}
@@ -93,40 +96,45 @@ function acf_new_admin_notice( $data = false ) {
*
* Renders all admin notices HTML.
*
- * @date 10/1/19
- * @since 5.7.10
+ * @date 10/1/19
+ * @since 5.7.10
*
- * @param void
- * @return void
+ * @param void
+ * @return void
*/
function acf_render_admin_notices() {
-
+
// Get notices.
$notices = acf_get_store( 'notices' )->get_data();
-
+
// Loop over notices and render.
- if( $notices ) {
- foreach( $notices as $notice ) {
+ if ( $notices ) {
+ foreach ( $notices as $notice ) {
$notice->render();
}
}
}
// Render notices during admin action.
-add_action('admin_notices', 'acf_render_admin_notices', 99);
+add_action( 'admin_notices', 'acf_render_admin_notices', 99 );
/**
* acf_add_admin_notice
*
* Creates and returns a new notice.
*
- * @date 17/10/13
- * @since 5.0.0
+ * @date 17/10/13
+ * @since 5.0.0
*
- * @param string $text The admin notice text.
- * @param string $class The type of notice (warning, error, success, info).
- * @return ACF_Admin_Notice
+ * @param string $text The admin notice text.
+ * @param string $class The type of notice (warning, error, success, info).
+ * @return ACF_Admin_Notice
*/
function acf_add_admin_notice( $text = '', $type = 'info' ) {
- return acf_new_admin_notice( array( 'text' => $text, 'type' => $type ) );
-}
\ No newline at end of file
+ return acf_new_admin_notice(
+ array(
+ 'text' => $text,
+ 'type' => $type,
+ )
+ );
+}
diff --git a/includes/admin/admin-tools.php b/includes/admin/admin-tools.php
index 5462b89..2fe04ba 100644
--- a/includes/admin/admin-tools.php
+++ b/includes/admin/admin-tools.php
@@ -1,291 +1,285 @@
-tools[ $instance->name ] = $instance;
-
- }
-
-
- /**
- * get_tool
- *
- * This function will return a tool tool class
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param string $name
- * @return n/a
- */
-
- function get_tool( $name ) {
-
- return isset( $this->tools[$name] ) ? $this->tools[$name] : null;
-
- }
-
-
- /**
- * get_tools
- *
- * This function will return an array of all tools
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return array
- */
-
- function get_tools() {
-
- return $this->tools;
-
- }
-
-
- /*
- * admin_menu
- *
- * This function will add the ACF menu item to the WP admin
- *
- * @type action (admin_menu)
- * @date 28/09/13
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function admin_menu() {
-
- // bail early if no show_admin
- if( !acf_get_setting('show_admin') ) return;
-
-
- // add page
- $page = add_submenu_page('edit.php?post_type=acf-field-group', __('Tools','acf'), __('Tools','acf'), acf_get_setting('capability'), 'acf-tools', array($this, 'html'));
-
-
- // actions
- add_action('load-' . $page, array($this, 'load'));
-
- }
-
-
- /**
- * load
- *
- * description
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function load() {
-
- // disable filters (default to raw data)
- acf_disable_filters();
-
-
- // include tools
- $this->include_tools();
-
-
- // check submit
- $this->check_submit();
-
-
- // load acf scripts
- acf_enqueue_scripts();
-
- }
-
-
- /**
- * include_tools
- *
- * description
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function include_tools() {
-
- // include
- acf_include('includes/admin/tools/class-acf-admin-tool.php');
- acf_include('includes/admin/tools/class-acf-admin-tool-export.php');
- acf_include('includes/admin/tools/class-acf-admin-tool-import.php');
-
-
- // action
- do_action('acf/include_admin_tools');
-
- }
-
-
- /**
- * check_submit
- *
- * description
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function check_submit() {
-
- // loop
- foreach( $this->get_tools() as $tool ) {
-
- // load
- $tool->load();
-
-
- // submit
- if( acf_verify_nonce($tool->name) ) {
- $tool->submit();
+ class acf_admin_tools {
+
+
+ /** @var array Contains an array of admin tool instances */
+ var $tools = array();
+
+
+ /** @var string The active tool */
+ var $active = '';
+
+
+ /**
+ * __construct
+ *
+ * This function will setup the class functionality
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function __construct() {
+
+ // actions
+ add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+
+ }
+
+
+ /**
+ * register_tool
+ *
+ * This function will store a tool tool class
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param string $class
+ * @return n/a
+ */
+
+ function register_tool( $class ) {
+
+ $instance = new $class();
+ $this->tools[ $instance->name ] = $instance;
+
+ }
+
+
+ /**
+ * get_tool
+ *
+ * This function will return a tool tool class
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param string $name
+ * @return n/a
+ */
+
+ function get_tool( $name ) {
+
+ return isset( $this->tools[ $name ] ) ? $this->tools[ $name ] : null;
+
+ }
+
+
+ /**
+ * get_tools
+ *
+ * This function will return an array of all tools
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return array
+ */
+
+ function get_tools() {
+
+ return $this->tools;
+
+ }
+
+
+ /*
+ * admin_menu
+ *
+ * This function will add the ACF menu item to the WP admin
+ *
+ * @type action (admin_menu)
+ * @date 28/09/13
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function admin_menu() {
+
+ // bail early if no show_admin
+ if ( ! acf_get_setting( 'show_admin' ) ) {
+ return;
}
-
+
+ // add page
+ $page = add_submenu_page( 'edit.php?post_type=acf-field-group', __( 'Tools', 'acf' ), __( 'Tools', 'acf' ), acf_get_setting( 'capability' ), 'acf-tools', array( $this, 'html' ) );
+
+ // actions
+ add_action( 'load-' . $page, array( $this, 'load' ) );
+
}
-
- }
-
-
- /**
- * html
- *
- * description
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function html() {
-
- // vars
- $screen = get_current_screen();
- $active = acf_maybe_get_GET('tool');
-
-
- // view
- $view = array(
- 'screen_id' => $screen->id,
- 'active' => $active
- );
-
-
- // register metaboxes
- foreach( $this->get_tools() as $tool ) {
-
- // check active
- if( $active && $active !== $tool->name ) continue;
-
- // add metabox
- add_meta_box( 'acf-admin-tool-' . $tool->name, acf_esc_html( $tool->title ), array($this, 'metabox_html'), $screen->id, 'normal', 'default', array('tool' => $tool->name) );
-
+
+
+ /**
+ * load
+ *
+ * description
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function load() {
+
+ // disable filters (default to raw data)
+ acf_disable_filters();
+
+ // include tools
+ $this->include_tools();
+
+ // check submit
+ $this->check_submit();
+
+ // load acf scripts
+ acf_enqueue_scripts();
+
}
-
-
- // view
- acf_get_view( 'html-admin-tools', $view );
-
- }
-
-
- /**
- * meta_box_html
- *
- * description
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function metabox_html( $post, $metabox ) {
-
- // vars
- $tool = $this->get_tool($metabox['args']['tool']);
-
-
- ?>
+
+
+ /**
+ * include_tools
+ *
+ * description
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function include_tools() {
+
+ // include
+ acf_include( 'includes/admin/tools/class-acf-admin-tool.php' );
+ acf_include( 'includes/admin/tools/class-acf-admin-tool-export.php' );
+ acf_include( 'includes/admin/tools/class-acf-admin-tool-import.php' );
+
+ // action
+ do_action( 'acf/include_admin_tools' );
+
+ }
+
+
+ /**
+ * check_submit
+ *
+ * description
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function check_submit() {
+
+ // loop
+ foreach ( $this->get_tools() as $tool ) {
+
+ // load
+ $tool->load();
+
+ // submit
+ if ( acf_verify_nonce( $tool->name ) ) {
+ $tool->submit();
+ }
+ }
+
+ }
+
+
+ /**
+ * html
+ *
+ * description
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function html() {
+
+ // vars
+ $screen = get_current_screen();
+ $active = acf_maybe_get_GET( 'tool' );
+
+ // view
+ $view = array(
+ 'screen_id' => $screen->id,
+ 'active' => $active,
+ );
+
+ // register metaboxes
+ foreach ( $this->get_tools() as $tool ) {
+
+ // check active
+ if ( $active && $active !== $tool->name ) {
+ continue;
+ }
+
+ // add metabox
+ add_meta_box( 'acf-admin-tool-' . $tool->name, acf_esc_html( $tool->title ), array( $this, 'metabox_html' ), $screen->id, 'normal', 'default', array( 'tool' => $tool->name ) );
+
+ }
+
+ // view
+ acf_get_view( 'html-admin-tools', $view );
+
+ }
+
+
+ /**
+ * meta_box_html
+ *
+ * description
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function metabox_html( $post, $metabox ) {
+
+ // vars
+ $tool = $this->get_tool( $metabox['args']['tool'] );
+
+ ?>
- admin_tools = new acf_admin_tools();
+ }
+
+ }
+
+ // initialize
+ acf()->admin_tools = new acf_admin_tools();
endif; // class_exists check
@@ -295,18 +289,18 @@ endif; // class_exists check
*
* alias of acf()->admin_tools->register_tool()
*
-* @type function
-* @date 31/5/17
-* @since 5.6.0
+* @type function
+* @date 31/5/17
+* @since 5.6.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function acf_register_admin_tool( $class ) {
-
+
return acf()->admin_tools->register_tool( $class );
-
+
}
@@ -315,18 +309,18 @@ function acf_register_admin_tool( $class ) {
*
* This function will return the admin URL to the tools page
*
-* @type function
-* @date 31/5/17
-* @since 5.6.0
+* @type function
+* @date 31/5/17
+* @since 5.6.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function acf_get_admin_tools_url() {
-
- return admin_url('edit.php?post_type=acf-field-group&page=acf-tools');
-
+
+ return admin_url( 'edit.php?post_type=acf-field-group&page=acf-tools' );
+
}
@@ -335,19 +329,19 @@ function acf_get_admin_tools_url() {
*
* This function will return the admin URL to the tools page
*
-* @type function
-* @date 31/5/17
-* @since 5.6.0
+* @type function
+* @date 31/5/17
+* @since 5.6.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function acf_get_admin_tool_url( $tool = '' ) {
-
- return acf_get_admin_tools_url() . '&tool='.$tool;
-
+
+ return acf_get_admin_tools_url() . '&tool=' . $tool;
+
}
-?>
\ No newline at end of file
+?>
diff --git a/includes/admin/admin-upgrade.php b/includes/admin/admin-upgrade.php
index e3275cb..fde6349 100644
--- a/includes/admin/admin-upgrade.php
+++ b/includes/admin/admin-upgrade.php
@@ -1,244 +1,246 @@
- 0 ) );
- if( $sites ) {
-
- // Unhook action to avoid memory issue (as seen in wp-includes/ms-site.php).
- remove_action( 'switch_blog', 'wp_switch_roles_and_user', 1 );
- foreach( $sites as $site ) {
-
- // Switch site.
- switch_to_blog( $site->blog_id );
-
- // Check for upgrade.
- $site_upgrade = acf_has_upgrade();
-
- // Restore site.
- // Ideally, we would switch back to the original site at after looping, however,
- // the restore_current_blog() is needed to modify global vars.
- restore_current_blog();
-
- // Check if upgrade was found.
- if( $site_upgrade ) {
- $upgrade = true;
- break;
- }
- }
- add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 );
- }
-
- // Bail early if no upgrade is needed.
- if( !$upgrade ) {
- return;
- }
-
- // Add notice.
- add_action('network_admin_notices', array($this, 'network_admin_notices'));
-
- // Add page.
- $page = add_submenu_page(
- 'index.php',
- __('Upgrade Database','acf'),
- __('Upgrade Database','acf'),
- acf_get_setting('capability'),
- 'acf-upgrade-network',
- array( $this,'network_admin_html' )
- );
- add_action( "load-$page", array( $this, 'network_admin_load' ) );
- }
-
- /**
- * admin_load
- *
- * Runs during the loading of the admin page.
- *
- * @date 24/8/18
- * @since 5.7.4
- *
- * @param type $var Description. Default.
- * @return type Description.
- */
- function admin_load() {
-
- // remove prompt
- remove_action('admin_notices', array($this, 'admin_notices'));
-
- // Enqueue core script.
- acf_enqueue_script( 'acf' );
- }
-
- /**
- * network_admin_load
- *
- * Runs during the loading of the network admin page.
- *
- * @date 24/8/18
- * @since 5.7.4
- *
- * @param type $var Description. Default.
- * @return type Description.
- */
- function network_admin_load() {
-
- // remove prompt
- remove_action('network_admin_notices', array($this, 'network_admin_notices'));
-
- // Enqueue core script.
- acf_enqueue_script( 'acf' );
- }
-
- /**
- * admin_notices
- *
- * Displays the DB Upgrade prompt.
- *
- * @date 23/8/18
- * @since 5.7.3
- *
- * @param void
- * @return void
- */
- function admin_notices() {
-
- // vars
- $view = array(
- 'button_text' => __("Upgrade Database", 'acf'),
- 'button_url' => admin_url('index.php?page=acf-upgrade'),
- 'confirm' => true
- );
-
- // view
- acf_get_view('html-notice-upgrade', $view);
- }
-
- /**
- * network_admin_notices
- *
- * Displays the DB Upgrade prompt on a multi site.
- *
- * @date 23/8/18
- * @since 5.7.3
- *
- * @param void
- * @return void
- */
- function network_admin_notices() {
-
- // vars
- $view = array(
- 'button_text' => __("Review sites & upgrade", 'acf'),
- 'button_url' => network_admin_url('index.php?page=acf-upgrade-network'),
- 'confirm' => false
- );
-
- // view
- acf_get_view('html-notice-upgrade', $view);
- }
-
- /**
- * admin_html
- *
- * Displays the HTML for the admin page.
- *
- * @date 24/8/18
- * @since 5.7.4
- *
- * @param void
- * @return void
- */
- function admin_html() {
- acf_get_view('html-admin-page-upgrade');
- }
-
- /**
- * network_admin_html
- *
- * Displays the HTML for the network upgrade admin page.
- *
- * @date 24/8/18
- * @since 5.7.4
- *
- * @param void
- * @return void
- */
- function network_admin_html() {
- acf_get_view('html-admin-page-upgrade-network');
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
-// instantiate
-acf_new_instance('ACF_Admin_Upgrade');
+if ( ! class_exists( 'ACF_Admin_Upgrade' ) ) :
+
+ class ACF_Admin_Upgrade {
+
+ /**
+ * __construct
+ *
+ * Sets up the class functionality.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param void
+ * @return void
+ */
+ function __construct() {
+
+ // actions
+ add_action( 'admin_menu', array( $this, 'admin_menu' ), 20 );
+ if ( is_multisite() ) {
+ add_action( 'network_admin_menu', array( $this, 'network_admin_menu' ), 20 );
+ }
+ }
+
+ /**
+ * admin_menu
+ *
+ * Setus up logic if DB Upgrade is needed on a single site.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param void
+ * @return void
+ */
+ function admin_menu() {
+
+ // check if upgrade is avaialble
+ if ( acf_has_upgrade() ) {
+
+ // add notice
+ add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+
+ // add page
+ $page = add_submenu_page( 'index.php', __( 'Upgrade Database', 'acf' ), __( 'Upgrade Database', 'acf' ), acf_get_setting( 'capability' ), 'acf-upgrade', array( $this, 'admin_html' ) );
+
+ // actions
+ add_action( 'load-' . $page, array( $this, 'admin_load' ) );
+ }
+ }
+
+ /**
+ * network_admin_menu
+ *
+ * Sets up admin logic if DB Upgrade is required on a multi site.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param void
+ * @return void
+ */
+ function network_admin_menu() {
+
+ // Vars.
+ $upgrade = false;
+
+ // Loop over sites and check for upgrades.
+ $sites = get_sites( array( 'number' => 0 ) );
+ if ( $sites ) {
+
+ // Unhook action to avoid memory issue (as seen in wp-includes/ms-site.php).
+ remove_action( 'switch_blog', 'wp_switch_roles_and_user', 1 );
+ foreach ( $sites as $site ) {
+
+ // Switch site.
+ switch_to_blog( $site->blog_id );
+
+ // Check for upgrade.
+ $site_upgrade = acf_has_upgrade();
+
+ // Restore site.
+ // Ideally, we would switch back to the original site at after looping, however,
+ // the restore_current_blog() is needed to modify global vars.
+ restore_current_blog();
+
+ // Check if upgrade was found.
+ if ( $site_upgrade ) {
+ $upgrade = true;
+ break;
+ }
+ }
+ add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 );
+ }
+
+ // Bail early if no upgrade is needed.
+ if ( ! $upgrade ) {
+ return;
+ }
+
+ // Add notice.
+ add_action( 'network_admin_notices', array( $this, 'network_admin_notices' ) );
+
+ // Add page.
+ $page = add_submenu_page(
+ 'index.php',
+ __( 'Upgrade Database', 'acf' ),
+ __( 'Upgrade Database', 'acf' ),
+ acf_get_setting( 'capability' ),
+ 'acf-upgrade-network',
+ array( $this, 'network_admin_html' )
+ );
+ add_action( "load-$page", array( $this, 'network_admin_load' ) );
+ }
+
+ /**
+ * admin_load
+ *
+ * Runs during the loading of the admin page.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param type $var Description. Default.
+ * @return type Description.
+ */
+ function admin_load() {
+
+ // remove prompt
+ remove_action( 'admin_notices', array( $this, 'admin_notices' ) );
+
+ // Enqueue core script.
+ acf_enqueue_script( 'acf' );
+ }
+
+ /**
+ * network_admin_load
+ *
+ * Runs during the loading of the network admin page.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param type $var Description. Default.
+ * @return type Description.
+ */
+ function network_admin_load() {
+
+ // remove prompt
+ remove_action( 'network_admin_notices', array( $this, 'network_admin_notices' ) );
+
+ // Enqueue core script.
+ acf_enqueue_script( 'acf' );
+ }
+
+ /**
+ * admin_notices
+ *
+ * Displays the DB Upgrade prompt.
+ *
+ * @date 23/8/18
+ * @since 5.7.3
+ *
+ * @param void
+ * @return void
+ */
+ function admin_notices() {
+
+ // vars
+ $view = array(
+ 'button_text' => __( 'Upgrade Database', 'acf' ),
+ 'button_url' => admin_url( 'index.php?page=acf-upgrade' ),
+ 'confirm' => true,
+ );
+
+ // view
+ acf_get_view( 'html-notice-upgrade', $view );
+ }
+
+ /**
+ * network_admin_notices
+ *
+ * Displays the DB Upgrade prompt on a multi site.
+ *
+ * @date 23/8/18
+ * @since 5.7.3
+ *
+ * @param void
+ * @return void
+ */
+ function network_admin_notices() {
+
+ // vars
+ $view = array(
+ 'button_text' => __( 'Review sites & upgrade', 'acf' ),
+ 'button_url' => network_admin_url( 'index.php?page=acf-upgrade-network' ),
+ 'confirm' => false,
+ );
+
+ // view
+ acf_get_view( 'html-notice-upgrade', $view );
+ }
+
+ /**
+ * admin_html
+ *
+ * Displays the HTML for the admin page.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param void
+ * @return void
+ */
+ function admin_html() {
+ acf_get_view( 'html-admin-page-upgrade' );
+ }
+
+ /**
+ * network_admin_html
+ *
+ * Displays the HTML for the network upgrade admin page.
+ *
+ * @date 24/8/18
+ * @since 5.7.4
+ *
+ * @param void
+ * @return void
+ */
+ function network_admin_html() {
+ acf_get_view( 'html-admin-page-upgrade-network' );
+ }
+ }
+
+ // instantiate
+ acf_new_instance( 'ACF_Admin_Upgrade' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/admin/admin.php b/includes/admin/admin.php
index d27d175..8af062b 100644
--- a/includes/admin/admin.php
+++ b/includes/admin/admin.php
@@ -1,207 +1,209 @@
-= 5.3 ) {
- $classes .= ' acf-admin-5-3';
- } else {
- $classes .= ' acf-admin-3-8';
- }
-
- // Add browser for specific CSS.
- $classes .= ' acf-browser-' . acf_get_browser();
-
- // Return classes.
- return $classes;
- }
-
- /**
- * Adds custom functionality to "ACF" admin pages.
- *
- * @date 7/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- function current_screen( $screen ) {
-
- // Determine if the current page being viewed is "ACF" related.
- if( isset( $screen->post_type ) && $screen->post_type === 'acf-field-group' ) {
- add_action( 'in_admin_header', array( $this, 'in_admin_header' ) );
- add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
- $this->setup_help_tab();
- }
- }
-
- /**
- * Sets up the admin help tab.
- *
- * @date 20/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- public function setup_help_tab() {
- $screen = get_current_screen();
-
- // Overview tab.
- $screen->add_help_tab(
- array(
- 'id' => 'overview',
- 'title' => __( 'Overview', 'acf' ),
- 'content' =>
- '' . __( 'Overview', 'acf' ) . '
' . - '' . __( 'The Advanced Custom Fields plugin provides a visual form builder to customize WordPress edit screens with extra fields, and an intuitive API to display custom field values in any theme template file.', 'acf' ) . '
' . - '' . sprintf( - __( 'Before creating your first Field Group, we recommend first reading our Getting started guide to familiarize yourself with the plugin\'s philosophy and best practises.', 'acf' ), - 'https://www.advancedcustomfields.com/resources/getting-started-with-acf/' - ) . '
' . - '' . __( 'Please use the Help & Support tab to get in touch should you find yourself requiring assistance.', 'acf' ) . '
' . - '' - ) - ); - - // Help tab. - $screen->add_help_tab( - array( - 'id' => 'help', - 'title' => __( 'Help & Support', 'acf' ), - 'content' => - '' . __( 'Help & Support', 'acf' ) . '
' . - '' . __( 'We are fanatical about support, and want you to get the best out of your website with ACF. If you run into any difficulties, there are several places you can find help:', 'acf' ) . '
' . - '- ' .
- '
- ' . sprintf( - __( 'Documentation. Our extensive documentation contains references and guides for most situations you may encounter.', 'acf' ), - 'https://www.advancedcustomfields.com/resources/' - ) . ' ' . - '
- ' . sprintf( - __( 'Discussions. We have an active and friendly community on our Community Forums who may be able to help you figure out the ‘how-tos’ of the ACF world.', 'acf' ), - 'https://support.advancedcustomfields.com/' - ) . ' ' . - '
- ' . sprintf( - __( 'Help Desk. The support professionals on our Help Desk will assist with your more in depth, technical challenges.', 'acf' ), - 'https://www.advancedcustomfields.com/support/' - ) . ' ' . - '
' . __( 'Information', 'acf' ) . '
' . - '' . sprintf( __( 'Version %s', 'acf' ), ACF_VERSION ) . '
' . - '' . __( 'View details', 'acf' ) . '
' . - '' . __( 'Visit website', 'acf' ) . '
' . - '' - ); - } - - /** - * Renders the admin navigation element. - * - * @date 27/3/20 - * @since 5.9.0 - * - * @param void - * @return void - */ - function in_admin_header() { - acf_get_view( 'html-admin-navigation' ); - } - - /** - * Modifies the admin footer text. - * - * @date 7/4/20 - * @since 5.9.0 - * - * @param string $text The admin footer text. - * @return string - */ - function admin_footer_text( $text ) { - // Use RegExp to append "ACF" after the element allowing translations to read correctly. - return preg_replace( '/(' . __( 'Overview', 'acf' ) . '
' . + '' . __( 'The Advanced Custom Fields plugin provides a visual form builder to customize WordPress edit screens with extra fields, and an intuitive API to display custom field values in any theme template file.', 'acf' ) . '
' . + '' . sprintf( + __( 'Before creating your first Field Group, we recommend first reading our Getting started guide to familiarize yourself with the plugin\'s philosophy and best practises.', 'acf' ), + 'https://www.advancedcustomfields.com/resources/getting-started-with-acf/' + ) . '
' . + '' . __( 'Please use the Help & Support tab to get in touch should you find yourself requiring assistance.', 'acf' ) . '
' . + '', + ) + ); + + // Help tab. + $screen->add_help_tab( + array( + 'id' => 'help', + 'title' => __( 'Help & Support', 'acf' ), + 'content' => + '' . __( 'Help & Support', 'acf' ) . '
' . + '' . __( 'We are fanatical about support, and want you to get the best out of your website with ACF. If you run into any difficulties, there are several places you can find help:', 'acf' ) . '
' . + '- ' .
+ '
- ' . sprintf( + __( 'Documentation. Our extensive documentation contains references and guides for most situations you may encounter.', 'acf' ), + 'https://www.advancedcustomfields.com/resources/' + ) . ' ' . + '
- ' . sprintf( + __( 'Discussions. We have an active and friendly community on our Community Forums who may be able to help you figure out the ‘how-tos’ of the ACF world.', 'acf' ), + 'https://support.advancedcustomfields.com/' + ) . ' ' . + '
- ' . sprintf( + __( 'Help Desk. The support professionals on our Help Desk will assist with your more in depth, technical challenges.', 'acf' ), + 'https://www.advancedcustomfields.com/support/' + ) . ' ' . + '
' . __( 'Information', 'acf' ) . '
' . + '' . sprintf( __( 'Version %s', 'acf' ), ACF_VERSION ) . '
' . + '' . __( 'View details', 'acf' ) . '
' . + '' . __( 'Visit website', 'acf' ) . '
' . + '' + ); + } + + /** + * Renders the admin navigation element. + * + * @date 27/3/20 + * @since 5.9.0 + * + * @param void + * @return void + */ + function in_admin_header() { + acf_get_view( 'html-admin-navigation' ); + } + + /** + * Modifies the admin footer text. + * + * @date 7/4/20 + * @since 5.9.0 + * + * @param string $text The admin footer text. + * @return string + */ + function admin_footer_text( $text ) { + // Use RegExp to append "ACF" after the element allowing translations to read correctly. + return preg_replace( '/(
-
-
+
+
html_field_selection(); ?>
-
-
-
+
+
+
- __('Empty settings', 'acf'),
- 'type' => 'select',
- 'name' => 'minimal',
- 'prefix' => false,
- 'value' => '',
- 'choices' => array(
- 'all' => __('Include all settings', 'acf'),
- 'minimal' => __('Ignore empty settings', 'acf'),
+ 'label' => __('Empty settings', 'acf'),
+ 'type' => 'select',
+ 'name' => 'minimal',
+ 'prefix' => false,
+ 'value' => '',
+ 'choices' => array(
+ 'all' => __('Include all settings', 'acf'),
+ 'minimal' => __('Ignore empty settings', 'acf'),
)
));
-*/
-
+ */
+
?>
html_field_selection(); ?>
- - + +
- +
html_generate(); ?>
@@ -368,80 +361,76 @@ class ACF_Admin_Tool_Export extends ACF_Admin_Tool {
- get_selected();
- $str_replace = array(
- " " => "\t",
- "'!!__(!!\'" => "__('",
- "!!\', !!\'" => "', '",
- "!!\')!!'" => "')",
- "array (" => "array("
- );
- $preg_replace = array(
- '/([\t\r\n]+?)array/' => 'array',
- '/[0-9]+ => array/' => 'array'
- );
+
-
-
+
+
+ /**
+ * html_generate
+ *
+ * description
+ *
+ * @date 17/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function html_generate() {
+
+ // prevent default translation and fake __() within string
+ acf_update_setting( 'l10n_var_export', true );
+
+ // vars
+ $json = $this->get_selected();
+ $str_replace = array(
+ ' ' => "\t",
+ "'!!__(!!\'" => "__('",
+ "!!\', !!\'" => "', '",
+ "!!\')!!'" => "')",
+ 'array (' => 'array(',
+ );
+ $preg_replace = array(
+ '/([\t\r\n]+?)array/' => 'array',
+ '/[0-9]+ => array/' => 'array',
+ );
+
+ ?>
+
+
@@ -480,7 +469,7 @@ class ACF_Admin_Tool_Export extends ACF_Admin_Tool {
// tooltip
acf.newTooltip({
- text: "",
+ text: "",
timeout: 250,
target: $(this),
});
@@ -495,102 +484,97 @@ class ACF_Admin_Tool_Export extends ACF_Admin_Tool {
})(jQuery);
- get_selected_keys();
- $json = array();
-
-
- // bail early if no keys
- if( !$selected ) return false;
-
-
- // construct JSON
- foreach( $selected as $key ) {
-
- // load field group
- $field_group = acf_get_field_group( $key );
-
-
- // validate field group
- if( empty($field_group) ) continue;
-
-
- // load fields
- $field_group['fields'] = acf_get_fields( $field_group );
-
-
- // prepare for export
- $field_group = acf_prepare_field_group_for_export( $field_group );
-
-
- // add to json array
- $json[] = $field_group;
-
- }
-
-
- // return
- return $json;
-
- }
-}
+ get_selected_keys();
+ $json = array();
+
+ // bail early if no keys
+ if ( ! $selected ) {
+ return false;
+ }
+
+ // construct JSON
+ foreach ( $selected as $key ) {
+
+ // load field group
+ $field_group = acf_get_field_group( $key );
+
+ // validate field group
+ if ( empty( $field_group ) ) {
+ continue;
+ }
+
+ // load fields
+ $field_group['fields'] = acf_get_fields( $field_group );
+
+ // prepare for export
+ $field_group = acf_prepare_field_group_for_export( $field_group );
+
+ // add to json array
+ $json[] = $field_group;
+
+ }
+
+ // return
+ return $json;
+
+ }
+ }
+
+ // initialize
+ acf_register_admin_tool( 'ACF_Admin_Tool_Export' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/admin/tools/class-acf-admin-tool-import.php b/includes/admin/tools/class-acf-admin-tool-import.php
index 1faaccd..cb85391 100644
--- a/includes/admin/tools/class-acf-admin-tool-import.php
+++ b/includes/admin/tools/class-acf-admin-tool-import.php
@@ -1,157 +1,161 @@
-name = 'import';
- $this->title = __("Import Field Groups", 'acf');
- $this->icon = 'dashicons-upload';
-
- }
-
-
- /**
- * html
- *
- * This function will output the metabox HTML
- *
- * @date 10/10/17
- * @since 5.6.3
- *
- * @param n/a
- * @return n/a
- */
-
- function html() {
-
- ?>
-
+ class ACF_Admin_Tool_Import extends ACF_Admin_Tool {
+
+
+ /**
+ * initialize
+ *
+ * This function will initialize the admin tool
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'import';
+ $this->title = __( 'Import Field Groups', 'acf' );
+ $this->icon = 'dashicons-upload';
+
+ }
+
+
+ /**
+ * html
+ *
+ * This function will output the metabox HTML
+ *
+ * @date 10/10/17
+ * @since 5.6.3
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function html() {
+
+ ?>
+
html_panel_selection(); ?>
- +
- __('Select File', 'acf'),
- 'type' => 'file',
- 'name' => 'acf_import_file',
- 'value' => false,
- 'uploader' => 'basic',
- ));
-
+ __( 'Select File', 'acf' ),
+ 'type' => 'file',
+ 'name' => 'acf_import_file',
+ 'value' => false,
+ 'uploader' => 'basic',
+ )
+ );
+
?>
- +
- ID; - } - - // Import field group. - $field_group = acf_import_field_group( $field_group ); - - // append message - $ids[] = $field_group['ID']; - } - - // Count number of imported field groups. - $total = count($ids); - - // Generate text. - $text = sprintf( _n( 'Imported 1 field group', 'Imported %s field groups', $total, 'acf' ), $total ); - - // Add links to text. - $links = array(); - foreach( $ids as $id ) { - $links[] = '' . get_the_title( $id ) . ''; - } - $text .= ' ' . implode( ', ', $links ); - - // Add notice - acf_add_admin_notice( $text, 'success' ); - } -} + ID; + } + + // Import field group. + $field_group = acf_import_field_group( $field_group ); + + // append message + $ids[] = $field_group['ID']; + } + + // Count number of imported field groups. + $total = count( $ids ); + + // Generate text. + $text = sprintf( _n( 'Imported 1 field group', 'Imported %s field groups', $total, 'acf' ), $total ); + + // Add links to text. + $links = array(); + foreach ( $ids as $id ) { + $links[] = '' . get_the_title( $id ) . ''; + } + $text .= ' ' . implode( ', ', $links ); + + // Add notice + acf_add_admin_notice( $text, 'success' ); + } + } + + // initialize + acf_register_admin_tool( 'ACF_Admin_Tool_Import' ); endif; // class_exists check -?> \ No newline at end of file +?> diff --git a/includes/admin/tools/class-acf-admin-tool.php b/includes/admin/tools/class-acf-admin-tool.php index 9f4c683..757298c 100644 --- a/includes/admin/tools/class-acf-admin-tool.php +++ b/includes/admin/tools/class-acf-admin-tool.php @@ -1,195 +1,194 @@ -name; - } - - - /** - * get_title - * - * This function will return the Tool's title - * - * @date 19/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function get_title() { - return $this->title; - } - - - /** - * get_url - * - * This function will return the Tool's title - * - * @date 19/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function get_url() { - return acf_get_admin_tool_url( $this->name ); - } - - - /** - * is_active - * - * This function will return true if the tool is active - * - * @date 19/10/17 - * @since 5.6.3 - * - * @param n/a - * @return bool - */ - - function is_active() { - return acf_maybe_get_GET('tool') === $this->name; - } - - - /* - * __construct - * - * This function will setup the class functionality - * - * @type function - * @date 27/6/17 - * @since 5.6.0 - * - * @param n/a - * @return n/a - */ - - function __construct() { - - // initialize - $this->initialize(); - - } - - - /** - * initialize - * - * This function will initialize the admin tool - * - * @date 10/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function initialize() { - - /* do nothing */ - - } - - - - /** - * load - * - * This function is called during the admin page load - * - * @date 10/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function load() { - - /* do nothing */ - - } - - - /** - * html - * - * This function will output the metabox HTML - * - * @date 10/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function html() { - - - - } - - - /** - * submit - * - * This function will run when the tool's form has been submit - * - * @date 10/10/17 - * @since 5.6.3 - * - * @param n/a - * @return n/a - */ - - function submit() { - - - } - - +if ( ! defined( 'ABSPATH' ) ) { + exit; // Exit if accessed directly } +if ( ! class_exists( 'ACF_Admin_Tool' ) ) : + + class ACF_Admin_Tool { + + + /** @var string Tool name */ + var $name = ''; + + + /** @var string Tool title */ + var $title = ''; + + + /** @var string Dashicon slug */ + // var $icon = ''; + + + /** @var boolean Redirect form to single */ + // var $redirect = false; + + + /** + * get_name + * + * This function will return the Tool's name + * + * @date 19/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function get_name() { + return $this->name; + } + + + /** + * get_title + * + * This function will return the Tool's title + * + * @date 19/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function get_title() { + return $this->title; + } + + + /** + * get_url + * + * This function will return the Tool's title + * + * @date 19/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function get_url() { + return acf_get_admin_tool_url( $this->name ); + } + + + /** + * is_active + * + * This function will return true if the tool is active + * + * @date 19/10/17 + * @since 5.6.3 + * + * @param n/a + * @return bool + */ + + function is_active() { + return acf_maybe_get_GET( 'tool' ) === $this->name; + } + + + /* + * __construct + * + * This function will setup the class functionality + * + * @type function + * @date 27/6/17 + * @since 5.6.0 + * + * @param n/a + * @return n/a + */ + + function __construct() { + + // initialize + $this->initialize(); + + } + + + /** + * initialize + * + * This function will initialize the admin tool + * + * @date 10/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function initialize() { + + /* do nothing */ + + } + + + + /** + * load + * + * This function is called during the admin page load + * + * @date 10/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function load() { + + /* do nothing */ + + } + + + /** + * html + * + * This function will output the metabox HTML + * + * @date 10/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function html() { + + } + + + /** + * submit + * + * This function will run when the tool's form has been submit + * + * @date 10/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function submit() { + + } + + + } + endif; // class_exists check -?> \ No newline at end of file + diff --git a/includes/admin/views/field-group-field-conditional-logic.php b/includes/admin/views/field-group-field-conditional-logic.php index a49f761..06d3565 100644 --- a/includes/admin/views/field-group-field-conditional-logic.php +++ b/includes/admin/views/field-group-field-conditional-logic.php @@ -1,55 +1,64 @@ -style="display:none;">
+
+ style="display:none;">
- $group ):
-
+ $group ) :
+
// validate
- if( empty($group) ) continue;
-
-
+ if ( empty( $group ) ) {
+ continue;
+ }
+
+
// vars
// $group_id must be completely different to $rule_id to avoid JS issues
$group_id = "group_{$group_id}";
- $h4 = ($group_id == "group_0") ? __("Show this field if",'acf') : __("or",'acf');
-
+ $h4 = ( $group_id == 'group_0' ) ? __( 'Show this field if', 'acf' ) : __( 'or', 'acf' );
+
?>
@@ -57,85 +66,95 @@ if( empty($field['conditional_logic']) ) {
- $rule ):
-
+ $rule ) :
+
// valid rule
- $rule = wp_parse_args( $rule, array(
- 'field' => '',
- 'operator' => '',
- 'value' => '',
- ));
-
-
- // vars
+ $rule = wp_parse_args(
+ $rule,
+ array(
+ 'field' => '',
+ 'operator' => '',
+ 'value' => '',
+ )
+ );
+
+
+ // vars
// $group_id must be completely different to $rule_id to avoid JS issues
$rule_id = "rule_{$rule_id}";
- $prefix = "{$field['prefix']}[conditional_logic][{$group_id}][{$rule_id}]";
-
+ $prefix = "{$field['prefix']}[conditional_logic][{$group_id}][{$rule_id}]";
+
// data attributes
$attributes = array(
- 'data-id' => $rule_id,
- 'data-field' => $rule['field'],
- 'data-operator' => $rule['operator'],
- 'data-value' => $rule['value']
+ 'data-id' => $rule_id,
+ 'data-field' => $rule['field'],
+ 'data-operator' => $rule['operator'],
+ 'data-value' => $rule['value'],
);
-
+
?>
-
diff --git a/includes/admin/views/field-group-locations.php b/includes/admin/views/field-group-locations.php
index 12c76a8..9b0a9bb 100644
--- a/includes/admin/views/field-group-locations.php
+++ b/includes/admin/views/field-group-locations.php
@@ -6,29 +6,36 @@ global $field_group;
?>
@@ -42,4 +49,4 @@ if( typeof acf !== 'undefined' ) {
});
}
-
\ No newline at end of file
+
diff --git a/includes/admin/views/field-group-options.php b/includes/admin/views/field-group-options.php
index e72cd08..64cba73 100644
--- a/includes/admin/views/field-group-options.php
+++ b/includes/admin/views/field-group-options.php
@@ -2,143 +2,159 @@
// global
global $field_group;
-
-
+
+
// active
-acf_render_field_wrap(array(
- 'label' => __('Active','acf'),
- 'instructions' => '',
- 'type' => 'true_false',
- 'name' => 'active',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['active'],
- 'ui' => 1,
- //'ui_on_text' => __('Active', 'acf'),
- //'ui_off_text' => __('Inactive', 'acf'),
-));
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Active', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'true_false',
+ 'name' => 'active',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['active'],
+ 'ui' => 1,
+ // 'ui_on_text' => __('Active', 'acf'),
+ // 'ui_off_text' => __('Inactive', 'acf'),
+ )
+);
// style
-acf_render_field_wrap(array(
- 'label' => __('Style','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'style',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['style'],
- 'choices' => array(
- 'default' => __("Standard (WP metabox)",'acf'),
- 'seamless' => __("Seamless (no metabox)",'acf'),
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Style', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'style',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['style'],
+ 'choices' => array(
+ 'default' => __( 'Standard (WP metabox)', 'acf' ),
+ 'seamless' => __( 'Seamless (no metabox)', 'acf' ),
+ ),
)
-));
+);
// position
-acf_render_field_wrap(array(
- 'label' => __('Position','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'position',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['position'],
- 'choices' => array(
- 'acf_after_title' => __("High (after title)",'acf'),
- 'normal' => __("Normal (after content)",'acf'),
- 'side' => __("Side",'acf'),
- ),
- 'default_value' => 'normal'
-));
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Position', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'position',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['position'],
+ 'choices' => array(
+ 'acf_after_title' => __( 'High (after title)', 'acf' ),
+ 'normal' => __( 'Normal (after content)', 'acf' ),
+ 'side' => __( 'Side', 'acf' ),
+ ),
+ 'default_value' => 'normal',
+ )
+);
// label_placement
-acf_render_field_wrap(array(
- 'label' => __('Label placement','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'label_placement',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['label_placement'],
- 'choices' => array(
- 'top' => __("Top aligned",'acf'),
- 'left' => __("Left aligned",'acf'),
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Label placement', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'label_placement',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['label_placement'],
+ 'choices' => array(
+ 'top' => __( 'Top aligned', 'acf' ),
+ 'left' => __( 'Left aligned', 'acf' ),
+ ),
)
-));
+);
// instruction_placement
-acf_render_field_wrap(array(
- 'label' => __('Instruction placement','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'instruction_placement',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['instruction_placement'],
- 'choices' => array(
- 'label' => __("Below labels",'acf'),
- 'field' => __("Below fields",'acf'),
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Instruction placement', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'instruction_placement',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['instruction_placement'],
+ 'choices' => array(
+ 'label' => __( 'Below labels', 'acf' ),
+ 'field' => __( 'Below fields', 'acf' ),
+ ),
)
-));
+);
// menu_order
-acf_render_field_wrap(array(
- 'label' => __('Order No.','acf'),
- 'instructions' => __('Field groups with a lower order will appear first','acf'),
- 'type' => 'number',
- 'name' => 'menu_order',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['menu_order'],
-));
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Order No.', 'acf' ),
+ 'instructions' => __( 'Field groups with a lower order will appear first', 'acf' ),
+ 'type' => 'number',
+ 'name' => 'menu_order',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['menu_order'],
+ )
+);
// description
-acf_render_field_wrap(array(
- 'label' => __('Description','acf'),
- 'instructions' => __('Shown in field group list','acf'),
- 'type' => 'text',
- 'name' => 'description',
- 'prefix' => 'acf_field_group',
- 'value' => $field_group['description'],
-));
+acf_render_field_wrap(
+ array(
+ 'label' => __( 'Description', 'acf' ),
+ 'instructions' => __( 'Shown in field group list', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'description',
+ 'prefix' => 'acf_field_group',
+ 'value' => $field_group['description'],
+ )
+);
// hide on screen
$choices = array(
- 'permalink' => __("Permalink", 'acf'),
- 'the_content' => __("Content Editor",'acf'),
- 'excerpt' => __("Excerpt", 'acf'),
- 'custom_fields' => __("Custom Fields", 'acf'),
- 'discussion' => __("Discussion", 'acf'),
- 'comments' => __("Comments", 'acf'),
- 'revisions' => __("Revisions", 'acf'),
- 'slug' => __("Slug", 'acf'),
- 'author' => __("Author", 'acf'),
- 'format' => __("Format", 'acf'),
- 'page_attributes' => __("Page Attributes", 'acf'),
- 'featured_image' => __("Featured Image", 'acf'),
- 'categories' => __("Categories", 'acf'),
- 'tags' => __("Tags", 'acf'),
- 'send-trackbacks' => __("Send Trackbacks", 'acf'),
+ 'permalink' => __( 'Permalink', 'acf' ),
+ 'the_content' => __( 'Content Editor', 'acf' ),
+ 'excerpt' => __( 'Excerpt', 'acf' ),
+ 'custom_fields' => __( 'Custom Fields', 'acf' ),
+ 'discussion' => __( 'Discussion', 'acf' ),
+ 'comments' => __( 'Comments', 'acf' ),
+ 'revisions' => __( 'Revisions', 'acf' ),
+ 'slug' => __( 'Slug', 'acf' ),
+ 'author' => __( 'Author', 'acf' ),
+ 'format' => __( 'Format', 'acf' ),
+ 'page_attributes' => __( 'Page Attributes', 'acf' ),
+ 'featured_image' => __( 'Featured Image', 'acf' ),
+ 'categories' => __( 'Categories', 'acf' ),
+ 'tags' => __( 'Tags', 'acf' ),
+ 'send-trackbacks' => __( 'Send Trackbacks', 'acf' ),
);
-if( acf_get_setting('remove_wp_meta_box') ) {
- unset( $choices['custom_fields'] );
+if ( acf_get_setting( 'remove_wp_meta_box' ) ) {
+ unset( $choices['custom_fields'] );
}
-acf_render_field_wrap(array(
- 'label' => __('Hide on screen','acf'),
- 'instructions' => __('Select items to hide them from the edit screen.','acf') . '
' . __("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)",'acf'), - 'type' => 'checkbox', - 'name' => 'hide_on_screen', - 'prefix' => 'acf_field_group', - 'value' => $field_group['hide_on_screen'], - 'toggle' => true, - 'choices' => $choices -)); +acf_render_field_wrap( + array( + 'label' => __( 'Hide on screen', 'acf' ), + 'instructions' => __( 'Select items to hide them from the edit screen.', 'acf' ) . '
' . __( "If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)", 'acf' ), + 'type' => 'checkbox', + 'name' => 'hide_on_screen', + 'prefix' => 'acf_field_group', + 'value' => $field_group['hide_on_screen'], + 'toggle' => true, + 'choices' => $choices, + ) +); // 3rd party settings -do_action('acf/render_field_group_settings', $field_group); - +do_action( 'acf/render_field_group_settings', $field_group ); + ?>
diff --git a/includes/admin/views/html-admin-page-upgrade.php b/includes/admin/views/html-admin-page-upgrade.php
index 3c0f9aa..a3ab091 100644
--- a/includes/admin/views/html-admin-page-upgrade.php
+++ b/includes/admin/views/html-admin-page-upgrade.php
@@ -1,14 +1,14 @@
- 'select',
- 'name' => 'param',
- 'prefix' => $prefix,
- 'value' => $rule['param'],
- 'choices' => $choices,
- 'class' => 'refresh-location-rule'
- ));
-
+ if ( is_array( $choices ) ) {
+
+ acf_render_field(
+ array(
+ 'type' => 'select',
+ 'name' => 'param',
+ 'prefix' => $prefix,
+ 'value' => $rule['param'],
+ 'choices' => $choices,
+ 'class' => 'refresh-location-rule',
+ )
+ );
+
}
-
+
?>
- 'select',
- 'name' => 'operator',
- 'prefix' => $prefix,
- 'value' => $rule['operator'],
- 'choices' => $choices
- ));
-
- // custom
+ if ( is_array( $choices ) ) {
+
+ acf_render_field(
+ array(
+ 'type' => 'select',
+ 'name' => 'operator',
+ 'prefix' => $prefix,
+ 'value' => $rule['operator'],
+ 'choices' => $choices,
+ )
+ );
+
+ // custom
} else {
-
+
echo $choices;
-
+
}
-
+
?>
'select',
- 'name' => 'value',
- 'prefix' => $prefix,
- 'value' => $rule['value'],
- 'choices' => $choices
- ));
-
- // custom
+ if ( is_array( $choices ) ) {
+
+ acf_render_field(
+ array(
+ 'type' => 'select',
+ 'name' => 'value',
+ 'prefix' => $prefix,
+ 'value' => $rule['value'],
+ 'choices' => $choices,
+ )
+ );
+
+ // custom
} else {
-
+
echo $choices;
-
+
}
-
+
?>
-
+
-
\ No newline at end of file
+
diff --git a/includes/admin/views/html-notice-upgrade.php b/includes/admin/views/html-notice-upgrade.php
index 11f40fd..6676f1b 100644
--- a/includes/admin/views/html-notice-upgrade.php
+++ b/includes/admin/views/html-notice-upgrade.php
@@ -1,15 +1,22 @@
-
@@ -17,11 +24,11 @@ if( !acf_get_setting('pro') ) {
@@ -71,10 +73,10 @@ class ACF_Ajax_Local_JSON_Diff extends ACF_Ajax {
' . wp_text_diff( acf_json_encode( $field_group ), acf_json_encode( $local_field_group ) ) . '
';
- return $json;
+ return $json;
+ }
}
-}
-acf_new_instance('ACF_Ajax_Local_JSON_Diff');
+ acf_new_instance( 'ACF_Ajax_Local_JSON_Diff' );
endif; // class_exists check
diff --git a/includes/ajax/class-acf-ajax-query-users.php b/includes/ajax/class-acf-ajax-query-users.php
index 7173b62..8f674c9 100644
--- a/includes/ajax/class-acf-ajax-query-users.php
+++ b/includes/ajax/class-acf-ajax-query-users.php
@@ -1,273 +1,275 @@
per_page;
- $args['paged'] = $this->page;
- if( $this->is_search ) {
- $args['search'] = "*{$this->search}*";
- }
-
- /**
- * Filters the query args.
- *
- * @date 21/5/19
- * @since 5.8.1
- *
- * @param array $args The query args.
- * @param array $request The query request.
- * @param ACF_Ajax_Query $query The query object.
- */
- return apply_filters( "acf/ajax/query_users/args", $args, $request, $this );
- }
-
- /**
- * Prepares args for the get_results() method.
- *
- * @date 23/3/20
- * @since 5.8.9
- *
- * @param array args The query args.
- * @return array
- */
- function prepare_args( $args ) {
-
- // Parse pagination args that may have been modified.
- if( isset($args['users_per_page']) ) {
- $this->per_page = intval($args['users_per_page']);
- unset( $args['users_per_page'] );
-
- } elseif( isset($args['number']) ) {
- $this->per_page = intval($args['number']);
- }
-
- if( isset($args['paged']) ) {
- $this->page = intval($args['paged']);
- unset( $args['paged'] );
- }
-
- // Set pagination args for fine control.
- $args['number'] = $this->per_page;
- $args['offset'] = $this->per_page * ($this->page - 1);
- $args['count_total'] = true;
- return $args;
- }
-
- /**
- * get_results
- *
- * Returns an array of results for the given args.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param array args The query args.
- * @return array
- */
- function get_results( $args ) {
- $results = array();
-
- // Prepare args for quey.
- $args = $this->prepare_args( $args );
-
- // Get result groups.
- if( !empty( $args['role__in']) ) {
- $roles = acf_get_user_role_labels( $args['role__in'] );
- } else {
- $roles = acf_get_user_role_labels();
- }
-
- // Return a flat array of results when searching or when queriying one group only.
- if( $this->is_search || count($roles) === 1 ) {
-
- // Query users and append to results.
- $wp_user_query = new WP_User_Query( $args );
- $users = (array) $wp_user_query->get_results();
- $total_users = $wp_user_query->get_total();
- foreach( $users as $user ) {
- $results[] = $this->get_result( $user );
- }
-
- // Determine if more results exist.
- // As this query does not return grouped results, the calculation can be exact (">").
- $this->more = ( $total_users > count($users) + $args['offset'] );
-
- // Otherwise, group results via role.
- } else {
-
- // Unset args that will interfer with query results.
- unset( $args['role__in'], $args['role__not_in'] );
-
- // Loop over each role.
- foreach( $roles as $role => $role_label ) {
-
- // Query users (for this role only).
- $args['role'] = $role;
- $wp_user_query = new WP_User_Query( $args );
- $users = (array) $wp_user_query->get_results();
- $total_users = $wp_user_query->get_total();
-
- //acf_log( $args );
- //acf_log( '- ', count($users) );
- //acf_log( '- ', $total_users );
-
- // If users were found for this query...
- if( $users ) {
-
- // Append optgroup of results.
- $role_results = array();
- foreach( $users as $user ) {
- $role_results[] = $this->get_result( $user );
- }
- $results[] = array(
- 'text' => $role_label,
- 'children' => $role_results
- );
-
- // End loop when enough results have been found.
- if( count($users) === $args['number'] ) {
-
- // Determine if more results exist.
- // As this query does return grouped results, the calculation is best left fuzzy to avoid querying the next group (">=").
- $this->more = ( $total_users >= count($users) + $args['offset'] );
- break;
-
- // Otherwise, modify the args so that the next query can continue on correctly.
- } else {
- $args['offset'] = 0;
- $args['number'] -= count($users);
- }
-
- // If no users were found (for the current pagination args), but there were users found for previous pages...
- // Modify the args so that the next query is offset slightly less (the number of total users) and can continue on correctly.
- } elseif( $total_users ) {
- $args['offset'] -= $total_users;
- continue;
-
- // Ignore roles that will never return a result.
- } else {
- continue;
- }
- }
- }
-
- /**
- * Filters the query results.
- *
- * @date 21/5/19
- * @since 5.8.1
- *
- * @param array $results The query results.
- * @param array $args The query args.
- * @param ACF_Ajax_Query $query The query object.
- */
- return apply_filters( "acf/ajax/query_users/results", $results, $args, $this );
- }
-
- /**
- * get_result
- *
- * Returns a single result for the given item object.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param mixed $item A single item from the queried results.
- * @return string
- */
- function get_result( $user ) {
- $item = acf_get_user_result( $user );
-
- /**
- * Filters the result item.
- *
- * @date 21/5/19
- * @since 5.8.1
- *
- * @param array $item The choice id and text.
- * @param ACF_User $user The user object.
- * @param ACF_Ajax_Query $query The query object.
- */
- return apply_filters( "acf/ajax/query_users/result", $item, $user, $this );
- }
-
- /**
- * Filters the WP_User_Query search columns.
- *
- * @date 9/3/20
- * @since 5.8.8
- *
- * @param array $columns An array of column names to be searched.
- * @param string $search The search term.
- * @param WP_User_Query $WP_User_Query The WP_User_Query instance.
- * @return array
- */
- function filter_search_columns( $columns, $search, $WP_User_Query ) {
-
- /**
- * Filters the column names to be searched.
- *
- * @date 21/5/19
- * @since 5.8.1
- *
- * @param array $columns An array of column names to be searched.
- * @param string $search The search term.
- * @param WP_User_Query $WP_User_Query The WP_User_Query instance.
- * @param ACF_Ajax_Query $query The query object.
- */
- return apply_filters( "acf/ajax/query_users/search_columns", $columns, $search, $WP_User_Query, $this );
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
-acf_new_instance('ACF_Ajax_Query_Users');
+if ( ! class_exists( 'ACF_Ajax_Query_Users' ) ) :
+
+ class ACF_Ajax_Query_Users extends ACF_Ajax_Query {
+
+ /** @var string The AJAX action name. */
+ var $action = 'acf/ajax/query_users';
+
+ /**
+ * init_request
+ *
+ * Called at the beginning of a request to setup properties.
+ *
+ * @date 23/5/19
+ * @since 5.8.1
+ *
+ * @param array $request The request args.
+ * @return void
+ */
+ function init_request( $request ) {
+ parent::init_request( $request );
+
+ // Customize query.
+ add_filter( 'user_search_columns', array( $this, 'filter_search_columns' ), 10, 3 );
+
+ /**
+ * Fires when a request is made.
+ *
+ * @date 21/5/19
+ * @since 5.8.1
+ *
+ * @param array $request The query request.
+ * @param ACF_Ajax_Query $query The query object.
+ */
+ do_action( 'acf/ajax/query_users/init', $request, $this );
+ }
+
+ /**
+ * get_args
+ *
+ * Returns an array of args for this query.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return array
+ */
+ function get_args( $request ) {
+ $args = parent::get_args( $request );
+ $args['number'] = $this->per_page;
+ $args['paged'] = $this->page;
+ if ( $this->is_search ) {
+ $args['search'] = "*{$this->search}*";
+ }
+
+ /**
+ * Filters the query args.
+ *
+ * @date 21/5/19
+ * @since 5.8.1
+ *
+ * @param array $args The query args.
+ * @param array $request The query request.
+ * @param ACF_Ajax_Query $query The query object.
+ */
+ return apply_filters( 'acf/ajax/query_users/args', $args, $request, $this );
+ }
+
+ /**
+ * Prepares args for the get_results() method.
+ *
+ * @date 23/3/20
+ * @since 5.8.9
+ *
+ * @param array args The query args.
+ * @return array
+ */
+ function prepare_args( $args ) {
+
+ // Parse pagination args that may have been modified.
+ if ( isset( $args['users_per_page'] ) ) {
+ $this->per_page = intval( $args['users_per_page'] );
+ unset( $args['users_per_page'] );
+
+ } elseif ( isset( $args['number'] ) ) {
+ $this->per_page = intval( $args['number'] );
+ }
+
+ if ( isset( $args['paged'] ) ) {
+ $this->page = intval( $args['paged'] );
+ unset( $args['paged'] );
+ }
+
+ // Set pagination args for fine control.
+ $args['number'] = $this->per_page;
+ $args['offset'] = $this->per_page * ( $this->page - 1 );
+ $args['count_total'] = true;
+ return $args;
+ }
+
+ /**
+ * get_results
+ *
+ * Returns an array of results for the given args.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array args The query args.
+ * @return array
+ */
+ function get_results( $args ) {
+ $results = array();
+
+ // Prepare args for quey.
+ $args = $this->prepare_args( $args );
+
+ // Get result groups.
+ if ( ! empty( $args['role__in'] ) ) {
+ $roles = acf_get_user_role_labels( $args['role__in'] );
+ } else {
+ $roles = acf_get_user_role_labels();
+ }
+
+ // Return a flat array of results when searching or when queriying one group only.
+ if ( $this->is_search || count( $roles ) === 1 ) {
+
+ // Query users and append to results.
+ $wp_user_query = new WP_User_Query( $args );
+ $users = (array) $wp_user_query->get_results();
+ $total_users = $wp_user_query->get_total();
+ foreach ( $users as $user ) {
+ $results[] = $this->get_result( $user );
+ }
+
+ // Determine if more results exist.
+ // As this query does not return grouped results, the calculation can be exact (">").
+ $this->more = ( $total_users > count( $users ) + $args['offset'] );
+
+ // Otherwise, group results via role.
+ } else {
+
+ // Unset args that will interfer with query results.
+ unset( $args['role__in'], $args['role__not_in'] );
+
+ // Loop over each role.
+ foreach ( $roles as $role => $role_label ) {
+
+ // Query users (for this role only).
+ $args['role'] = $role;
+ $wp_user_query = new WP_User_Query( $args );
+ $users = (array) $wp_user_query->get_results();
+ $total_users = $wp_user_query->get_total();
+
+ // acf_log( $args );
+ // acf_log( '- ', count($users) );
+ // acf_log( '- ', $total_users );
+
+ // If users were found for this query...
+ if ( $users ) {
+
+ // Append optgroup of results.
+ $role_results = array();
+ foreach ( $users as $user ) {
+ $role_results[] = $this->get_result( $user );
+ }
+ $results[] = array(
+ 'text' => $role_label,
+ 'children' => $role_results,
+ );
+
+ // End loop when enough results have been found.
+ if ( count( $users ) === $args['number'] ) {
+
+ // Determine if more results exist.
+ // As this query does return grouped results, the calculation is best left fuzzy to avoid querying the next group (">=").
+ $this->more = ( $total_users >= count( $users ) + $args['offset'] );
+ break;
+
+ // Otherwise, modify the args so that the next query can continue on correctly.
+ } else {
+ $args['offset'] = 0;
+ $args['number'] -= count( $users );
+ }
+
+ // If no users were found (for the current pagination args), but there were users found for previous pages...
+ // Modify the args so that the next query is offset slightly less (the number of total users) and can continue on correctly.
+ } elseif ( $total_users ) {
+ $args['offset'] -= $total_users;
+ continue;
+
+ // Ignore roles that will never return a result.
+ } else {
+ continue;
+ }
+ }
+ }
+
+ /**
+ * Filters the query results.
+ *
+ * @date 21/5/19
+ * @since 5.8.1
+ *
+ * @param array $results The query results.
+ * @param array $args The query args.
+ * @param ACF_Ajax_Query $query The query object.
+ */
+ return apply_filters( 'acf/ajax/query_users/results', $results, $args, $this );
+ }
+
+ /**
+ * get_result
+ *
+ * Returns a single result for the given item object.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param mixed $item A single item from the queried results.
+ * @return string
+ */
+ function get_result( $user ) {
+ $item = acf_get_user_result( $user );
+
+ /**
+ * Filters the result item.
+ *
+ * @date 21/5/19
+ * @since 5.8.1
+ *
+ * @param array $item The choice id and text.
+ * @param ACF_User $user The user object.
+ * @param ACF_Ajax_Query $query The query object.
+ */
+ return apply_filters( 'acf/ajax/query_users/result', $item, $user, $this );
+ }
+
+ /**
+ * Filters the WP_User_Query search columns.
+ *
+ * @date 9/3/20
+ * @since 5.8.8
+ *
+ * @param array $columns An array of column names to be searched.
+ * @param string $search The search term.
+ * @param WP_User_Query $WP_User_Query The WP_User_Query instance.
+ * @return array
+ */
+ function filter_search_columns( $columns, $search, $WP_User_Query ) {
+
+ /**
+ * Filters the column names to be searched.
+ *
+ * @date 21/5/19
+ * @since 5.8.1
+ *
+ * @param array $columns An array of column names to be searched.
+ * @param string $search The search term.
+ * @param WP_User_Query $WP_User_Query The WP_User_Query instance.
+ * @param ACF_Ajax_Query $query The query object.
+ */
+ return apply_filters( 'acf/ajax/query_users/search_columns', $columns, $search, $WP_User_Query, $this );
+ }
+ }
+
+ acf_new_instance( 'ACF_Ajax_Query_Users' );
endif; // class_exists check
diff --git a/includes/ajax/class-acf-ajax-query.php b/includes/ajax/class-acf-ajax-query.php
index 026b05a..dd1bfe6 100644
--- a/includes/ajax/class-acf-ajax-query.php
+++ b/includes/ajax/class-acf-ajax-query.php
@@ -1,150 +1,152 @@
init_request( $request );
-
- // Get query args.
- $args = $this->get_args( $request );
-
- // Get query results.
- $results = $this->get_results( $args );
- if( is_wp_error($results) ) {
- return $results;
- }
-
- // Return response.
- return array(
- 'results' => $results,
- 'more' => $this->more
- );
- }
-
- /**
- * init_request
- *
- * Called at the beginning of a request to setup properties.
- *
- * @date 23/5/19
- * @since 5.8.1
- *
- * @param array $request The request args.
- * @return void
- */
- function init_request( $request ) {
-
- // Get field for this query.
- if( isset($request['field_key']) ) {
- $this->field = acf_get_field( $request['field_key'] );
- }
-
- // Update query properties.
- if( isset($request['page']) ) {
- $this->page = intval($request['page']);
- }
- if( isset($request['per_page']) ) {
- $this->per_page = intval($request['per_page']);
- }
- if( isset($request['search']) && acf_not_empty($request['search']) ) {
- $this->search = sanitize_text_field($request['search']);
- $this->is_search = true;
- }
- if( isset($request['post_id']) ) {
- $this->post_id = $request['post_id'];
- }
- }
-
- /**
- * get_args
- *
- * Returns an array of args for this query.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param array $request The request args.
- * @return array
- */
- function get_args( $request ) {
-
- // Allow for custom "query" arg.
- if( isset($request['query']) ) {
- return (array) $request['query'];
- }
- return array();
- }
-
- /**
- * get_items
- *
- * Returns an array of results for the given args.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param array args The query args.
- * @return array
- */
- function get_results( $args ) {
- return array();
- }
-
- /**
- * get_item
- *
- * Returns a single result for the given item object.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param mixed $item A single item from the queried results.
- * @return array An array containing "id" and "text".
- */
- function get_result( $item ) {
- return false;
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
+if ( ! class_exists( 'ACF_Ajax_Query' ) ) :
+
+ class ACF_Ajax_Query extends ACF_Ajax {
+
+ /** @var bool Prevents access for non-logged in users. */
+ var $public = true;
+
+ /** @var int The page of results to return. */
+ var $page = 1;
+
+ /** @var int The number of results per page. */
+ var $per_page = 20;
+
+ /** @var bool Signifies whether or not this AJAX query has more pages to load. */
+ var $more = false;
+
+ /** @var string The searched term. */
+ var $search = '';
+
+ /** @var bool Signifies whether the current query is a search. */
+ var $is_search = false;
+
+ /** @var (int|string) The post_id being edited. */
+ var $post_id = 0;
+
+ /** @var array The ACF field related to this query. */
+ var $field = false;
+
+ /**
+ * get_response
+ *
+ * Returns the response data to sent back.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return (array|WP_Error) The response data or WP_Error.
+ */
+ function get_response( $request ) {
+
+ // Init request.
+ $this->init_request( $request );
+
+ // Get query args.
+ $args = $this->get_args( $request );
+
+ // Get query results.
+ $results = $this->get_results( $args );
+ if ( is_wp_error( $results ) ) {
+ return $results;
+ }
+
+ // Return response.
+ return array(
+ 'results' => $results,
+ 'more' => $this->more,
+ );
+ }
+
+ /**
+ * init_request
+ *
+ * Called at the beginning of a request to setup properties.
+ *
+ * @date 23/5/19
+ * @since 5.8.1
+ *
+ * @param array $request The request args.
+ * @return void
+ */
+ function init_request( $request ) {
+
+ // Get field for this query.
+ if ( isset( $request['field_key'] ) ) {
+ $this->field = acf_get_field( $request['field_key'] );
+ }
+
+ // Update query properties.
+ if ( isset( $request['page'] ) ) {
+ $this->page = intval( $request['page'] );
+ }
+ if ( isset( $request['per_page'] ) ) {
+ $this->per_page = intval( $request['per_page'] );
+ }
+ if ( isset( $request['search'] ) && acf_not_empty( $request['search'] ) ) {
+ $this->search = sanitize_text_field( $request['search'] );
+ $this->is_search = true;
+ }
+ if ( isset( $request['post_id'] ) ) {
+ $this->post_id = $request['post_id'];
+ }
+ }
+
+ /**
+ * get_args
+ *
+ * Returns an array of args for this query.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return array
+ */
+ function get_args( $request ) {
+
+ // Allow for custom "query" arg.
+ if ( isset( $request['query'] ) ) {
+ return (array) $request['query'];
+ }
+ return array();
+ }
+
+ /**
+ * get_items
+ *
+ * Returns an array of results for the given args.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array args The query args.
+ * @return array
+ */
+ function get_results( $args ) {
+ return array();
+ }
+
+ /**
+ * get_item
+ *
+ * Returns a single result for the given item object.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param mixed $item A single item from the queried results.
+ * @return array An array containing "id" and "text".
+ */
+ function get_result( $item ) {
+ return false;
+ }
+ }
+
endif; // class_exists check
diff --git a/includes/ajax/class-acf-ajax-upgrade.php b/includes/ajax/class-acf-ajax-upgrade.php
index 2f08e53..b01452b 100644
--- a/includes/ajax/class-acf-ajax-upgrade.php
+++ b/includes/ajax/class-acf-ajax-upgrade.php
@@ -1,54 +1,56 @@
has('value') ) {
- return acf_update_user_setting( $this->get('name'), $this->get('value') );
-
- // get
- } else {
- return acf_get_user_setting( $this->get('name') );
- }
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
-acf_new_instance('ACF_Ajax_User_Setting');
+if ( ! class_exists( 'ACF_Ajax_User_Setting' ) ) :
+
+ class ACF_Ajax_User_Setting extends ACF_Ajax {
+
+ /** @var string The AJAX action name. */
+ var $action = 'acf/ajax/user_setting';
+
+ /** @var bool Prevents access for non-logged in users. */
+ var $public = true;
+
+ /**
+ * get_response
+ *
+ * Returns the response data to sent back.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return mixed The response data or WP_Error.
+ */
+ function get_response( $request ) {
+
+ // update
+ if ( $this->has( 'value' ) ) {
+ return acf_update_user_setting( $this->get( 'name' ), $this->get( 'value' ) );
+
+ // get
+ } else {
+ return acf_get_user_setting( $this->get( 'name' ) );
+ }
+ }
+ }
+
+ acf_new_instance( 'ACF_Ajax_User_Setting' );
endif; // class_exists check
diff --git a/includes/ajax/class-acf-ajax.php b/includes/ajax/class-acf-ajax.php
index ed09791..9894bb7 100644
--- a/includes/ajax/class-acf-ajax.php
+++ b/includes/ajax/class-acf-ajax.php
@@ -1,227 +1,232 @@
initialize();
- $this->add_actions();
- }
-
- /**
- * has
- *
- * Returns true if the request has data for the given key.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param string $key The data key.
- * @return boolean
- */
- function has( $key = '' ) {
- return isset($this->request[$key]);
- }
-
- /**
- * get
- *
- * Returns request data for the given key.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param string $key The data key.
- * @return mixed
- */
- function get( $key = '' ) {
- return isset($this->request[$key]) ? $this->request[$key] : null;
- }
-
- /**
- * Sets request data for the given key.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param string $key The data key.
- * @param mixed $value The data value.
- * @return ACF_Ajax
- */
- function set( $key = '', $value = null ) {
- $this->request[$key] = $value;
- return $this;
- }
-
- /**
- * initialize
- *
- * Allows easy access to modifying properties without changing constructor.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param void
- * @return void
- */
- function initialize() {
- /* do nothing */
- }
-
- /**
- * add_actions
- *
- * Adds the ajax actions for this response.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param void
- * @return void
- */
- function add_actions() {
-
- // add action for logged-in users
- add_action( "wp_ajax_{$this->action}", array($this, 'request') );
-
- // add action for non logged-in users
- if( $this->public ) {
- add_action( "wp_ajax_nopriv_{$this->action}", array($this, 'request') );
- }
- }
-
- /**
- * request
- *
- * Callback for ajax action. Sets up properties and calls the get_response() function.
- *
- * @date 1/8/18
- * @since 5.7.2
- *
- * @param void
- * @return void
- */
- function request() {
-
- // Store data for has() and get() functions.
- $this->request = wp_unslash($_REQUEST);
-
- // Verify request and handle error.
- $error = $this->verify_request( $this->request );
- if( is_wp_error( $error ) ) {
- $this->send( $error );
- }
-
- // Send response.
- $this->send( $this->get_response( $this->request ) );
- }
-
- /**
- * Verifies the request.
- *
- * @date 9/3/20
- * @since 5.8.8
- *
- * @param array $request The request args.
- * @return (bool|WP_Error) True on success, WP_Error on fail.
- */
- function verify_request( $request ) {
-
- // Verify nonce.
- if( !acf_verify_ajax() ) {
- return new WP_Error( 'acf_invalid_nonce', __( 'Invalid nonce.', 'acf' ), array( 'status' => 404 ) );
- }
- return true;
- }
-
- /**
- * get_response
- *
- * Returns the response data to sent back.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param array $request The request args.
- * @return mixed The response data or WP_Error.
- */
- function get_response( $request ) {
- return true;
- }
-
- /**
- * send
- *
- * Sends back JSON based on the $response as either success or failure.
- *
- * @date 31/7/18
- * @since 5.7.2
- *
- * @param mixed $response The response to send back.
- * @return void
- */
- function send( $response ) {
-
- // Return error.
- if( is_wp_error($response) ) {
- $this->send_error( $response );
-
- // Return success.
- } else {
- wp_send_json( $response );
- }
- }
-
- /**
- * Sends a JSON response for the given WP_Error object.
- *
- * @date 8/3/20
- * @since 5.8.8
- *
- * @param WP_Error error The error object.
- * @return void
- */
- function send_error( $error ) {
-
- // Get error status
- $error_data = $error->get_error_data();
- if( is_array($error_data) && isset($error_data['status']) ) {
- $status_code = $error_data['status'];
- } else {
- $status_code = 500;
- }
-
- wp_send_json(array(
- 'code' => $error->get_error_code(),
- 'message' => $error->get_error_message(),
- 'data' => $error->get_error_data()
- ), $status_code);
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
+if ( ! class_exists( 'ACF_Ajax' ) ) :
+
+ class ACF_Ajax {
+
+ /** @var string The AJAX action name. */
+ var $action = '';
+
+ /** @var array The $_REQUEST data. */
+ var $request;
+
+ /** @var bool Prevents access for non-logged in users. */
+ var $public = false;
+
+ /**
+ * __construct
+ *
+ * Sets up the class functionality.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param void
+ * @return void
+ */
+ function __construct() {
+ $this->initialize();
+ $this->add_actions();
+ }
+
+ /**
+ * has
+ *
+ * Returns true if the request has data for the given key.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param string $key The data key.
+ * @return boolean
+ */
+ function has( $key = '' ) {
+ return isset( $this->request[ $key ] );
+ }
+
+ /**
+ * get
+ *
+ * Returns request data for the given key.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param string $key The data key.
+ * @return mixed
+ */
+ function get( $key = '' ) {
+ return isset( $this->request[ $key ] ) ? $this->request[ $key ] : null;
+ }
+
+ /**
+ * Sets request data for the given key.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param string $key The data key.
+ * @param mixed $value The data value.
+ * @return ACF_Ajax
+ */
+ function set( $key = '', $value = null ) {
+ $this->request[ $key ] = $value;
+ return $this;
+ }
+
+ /**
+ * initialize
+ *
+ * Allows easy access to modifying properties without changing constructor.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param void
+ * @return void
+ */
+ function initialize() {
+ /* do nothing */
+ }
+
+ /**
+ * add_actions
+ *
+ * Adds the ajax actions for this response.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param void
+ * @return void
+ */
+ function add_actions() {
+
+ // add action for logged-in users
+ add_action( "wp_ajax_{$this->action}", array( $this, 'request' ) );
+
+ // add action for non logged-in users
+ if ( $this->public ) {
+ add_action( "wp_ajax_nopriv_{$this->action}", array( $this, 'request' ) );
+ }
+ }
+
+ /**
+ * request
+ *
+ * Callback for ajax action. Sets up properties and calls the get_response() function.
+ *
+ * @date 1/8/18
+ * @since 5.7.2
+ *
+ * @param void
+ * @return void
+ */
+ function request() {
+
+ // Store data for has() and get() functions.
+ $this->request = wp_unslash( $_REQUEST );
+
+ // Verify request and handle error.
+ $error = $this->verify_request( $this->request );
+ if ( is_wp_error( $error ) ) {
+ $this->send( $error );
+ }
+
+ // Send response.
+ $this->send( $this->get_response( $this->request ) );
+ }
+
+ /**
+ * Verifies the request.
+ *
+ * @date 9/3/20
+ * @since 5.8.8
+ *
+ * @param array $request The request args.
+ * @return (bool|WP_Error) True on success, WP_Error on fail.
+ */
+ function verify_request( $request ) {
+
+ // Verify nonce.
+ if ( ! acf_verify_ajax() ) {
+ return new WP_Error( 'acf_invalid_nonce', __( 'Invalid nonce.', 'acf' ), array( 'status' => 404 ) );
+ }
+ return true;
+ }
+
+ /**
+ * get_response
+ *
+ * Returns the response data to sent back.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return mixed The response data or WP_Error.
+ */
+ function get_response( $request ) {
+ return true;
+ }
+
+ /**
+ * send
+ *
+ * Sends back JSON based on the $response as either success or failure.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param mixed $response The response to send back.
+ * @return void
+ */
+ function send( $response ) {
+
+ // Return error.
+ if ( is_wp_error( $response ) ) {
+ $this->send_error( $response );
+
+ // Return success.
+ } else {
+ wp_send_json( $response );
+ }
+ }
+
+ /**
+ * Sends a JSON response for the given WP_Error object.
+ *
+ * @date 8/3/20
+ * @since 5.8.8
+ *
+ * @param WP_Error error The error object.
+ * @return void
+ */
+ function send_error( $error ) {
+
+ // Get error status
+ $error_data = $error->get_error_data();
+ if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+ $status_code = $error_data['status'];
+ } else {
+ $status_code = 500;
+ }
+
+ wp_send_json(
+ array(
+ 'code' => $error->get_error_code(),
+ 'message' => $error->get_error_message(),
+ 'data' => $error->get_error_data(),
+ ),
+ $status_code
+ );
+ }
+ }
+
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/api/api-helpers.php b/includes/api/api-helpers.php
index 1ef5cd8..ae9884e 100644
--- a/includes/api/api-helpers.php
+++ b/includes/api/api-helpers.php
@@ -1,35 +1,35 @@
-has_setting()
-*
-* @date 2/2/18
-* @since 5.6.5
-*
-* @param n/a
-* @return n/a
-*/
+ * acf_has_setting
+ *
+ * alias of acf()->has_setting()
+ *
+ * @date 2/2/18
+ * @since 5.6.5
+ *
+ * @param n/a
+ * @return n/a
+ */
function acf_has_setting( $name = '' ) {
return acf()->has_setting( $name );
@@ -37,16 +37,16 @@ function acf_has_setting( $name = '' ) {
/**
-* acf_raw_setting
-*
-* alias of acf()->get_setting()
-*
-* @date 2/2/18
-* @since 5.6.5
-*
-* @param n/a
-* @return n/a
-*/
+ * acf_raw_setting
+ *
+ * alias of acf()->get_setting()
+ *
+ * @date 2/2/18
+ * @since 5.6.5
+ *
+ * @param n/a
+ * @return n/a
+ */
function acf_raw_setting( $name = '' ) {
return acf()->get_setting( $name );
@@ -58,39 +58,39 @@ function acf_raw_setting( $name = '' ) {
*
* alias of acf()->update_setting()
*
-* @type function
-* @date 28/09/13
-* @since 5.0.0
+* @type function
+* @date 28/09/13
+* @since 5.0.0
*
-* @param $name (string)
-* @param $value (mixed)
-* @return n/a
+* @param $name (string)
+* @param $value (mixed)
+* @return n/a
*/
function acf_update_setting( $name, $value ) {
-
+
// validate name
$name = acf_validate_setting( $name );
-
+
// update
return acf()->update_setting( $name, $value );
}
/**
-* acf_validate_setting
-*
-* Returns the changed setting name if available.
-*
-* @date 2/2/18
-* @since 5.6.5
-*
-* @param n/a
-* @return n/a
-*/
+ * acf_validate_setting
+ *
+ * Returns the changed setting name if available.
+ *
+ * @date 2/2/18
+ * @since 5.6.5
+ *
+ * @param n/a
+ * @return n/a
+ */
function acf_validate_setting( $name = '' ) {
- return apply_filters( "acf/validate_setting", $name );
+ return apply_filters( 'acf/validate_setting', $name );
}
@@ -99,27 +99,27 @@ function acf_validate_setting( $name = '' ) {
*
* alias of acf()->get_setting()
*
-* @type function
-* @date 28/09/13
-* @since 5.0.0
+* @type function
+* @date 28/09/13
+* @since 5.0.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function acf_get_setting( $name, $value = null ) {
-
+
// validate name
$name = acf_validate_setting( $name );
-
+
// check settings
- if( acf_has_setting($name) ) {
+ if ( acf_has_setting( $name ) ) {
$value = acf_raw_setting( $name );
}
-
+
// filter
$value = apply_filters( "acf/settings/{$name}", $value );
-
+
// return
return $value;
}
@@ -130,44 +130,44 @@ function acf_get_setting( $name, $value = null ) {
*
* This function will add a value into the settings array found in the acf object
*
-* @type function
-* @date 28/09/13
-* @since 5.0.0
+* @type function
+* @date 28/09/13
+* @since 5.0.0
*
-* @param $name (string)
-* @param $value (mixed)
-* @return n/a
+* @param $name (string)
+* @param $value (mixed)
+* @return n/a
*/
function acf_append_setting( $name, $value ) {
-
+
// vars
$setting = acf_raw_setting( $name );
-
+
// bail ealry if not array
- if( !is_array($setting) ) {
+ if ( ! is_array( $setting ) ) {
$setting = array();
}
-
+
// append
$setting[] = $value;
-
+
// update
return acf_update_setting( $name, $setting );
}
/**
-* acf_get_data
-*
-* Returns data.
-*
-* @date 28/09/13
-* @since 5.0.0
-*
-* @param string $name
-* @return mixed
-*/
+ * acf_get_data
+ *
+ * Returns data.
+ *
+ * @date 28/09/13
+ * @since 5.0.0
+ *
+ * @param string $name
+ * @return mixed
+ */
function acf_get_data( $name ) {
return acf()->get_data( $name );
@@ -175,17 +175,17 @@ function acf_get_data( $name ) {
/**
-* acf_set_data
-*
-* Sets data.
-*
-* @date 28/09/13
-* @since 5.0.0
-*
-* @param string $name
-* @param mixed $value
-* @return n/a
-*/
+ * acf_set_data
+ *
+ * Sets data.
+ *
+ * @date 28/09/13
+ * @since 5.0.0
+ *
+ * @param string $name
+ * @param mixed $value
+ * @return n/a
+ */
function acf_set_data( $name, $value ) {
return acf()->set_data( $name, $value );
@@ -194,15 +194,15 @@ function acf_set_data( $name, $value ) {
/**
* Appends data to an existing key.
*
- * @date 11/06/2020
- * @since 5.9.0
+ * @date 11/06/2020
+ * @since 5.9.0
*
- * @param string $name The data name.
- * @return array $data The data array.
+ * @param string $name The data name.
+ * @return array $data The data array.
*/
function acf_append_data( $name, $data ) {
$prev_data = acf()->get_data( $name );
- if( is_array($prev_data) ) {
+ if ( is_array( $prev_data ) ) {
$data = array_merge( $prev_data, $data );
}
acf()->set_data( $name, $data );
@@ -213,18 +213,18 @@ function acf_append_data( $name, $data ) {
*
* alias of acf()->init()
*
-* @type function
-* @date 28/09/13
-* @since 5.0.0
+* @type function
+* @date 28/09/13
+* @since 5.0.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function acf_init() {
-
+
acf()->init();
-
+
}
@@ -233,23 +233,23 @@ function acf_init() {
*
* This function will return true if this action has already been done
*
-* @type function
-* @date 16/12/2015
-* @since 5.3.2
+* @type function
+* @date 16/12/2015
+* @since 5.3.2
*
-* @param $name (string)
-* @return (boolean)
+* @param $name (string)
+* @return (boolean)
*/
function acf_has_done( $name ) {
-
+
// return true if already done
- if( acf_raw_setting("has_done_{$name}") ) {
+ if ( acf_raw_setting( "has_done_{$name}" ) ) {
return true;
}
-
+
// update setting and return
- acf_update_setting("has_done_{$name}", true);
+ acf_update_setting( "has_done_{$name}", true );
return false;
}
@@ -261,19 +261,19 @@ function acf_has_done( $name ) {
*
* This function will return the path to a file within an external folder
*
-* @type function
-* @date 22/2/17
-* @since 5.5.8
+* @type function
+* @date 22/2/17
+* @since 5.5.8
*
-* @param $file (string)
-* @param $path (string)
-* @return (string)
+* @param $file (string)
+* @param $path (string)
+* @return (string)
*/
function acf_get_external_path( $file, $path = '' ) {
-
- return plugin_dir_path( $file ) . $path;
-
+
+ return plugin_dir_path( $file ) . $path;
+
}
@@ -282,64 +282,62 @@ function acf_get_external_path( $file, $path = '' ) {
*
* This function will return the url to a file within an external folder
*
-* @type function
-* @date 22/2/17
-* @since 5.5.8
+* @type function
+* @date 22/2/17
+* @since 5.5.8
*
-* @param $file (string)
-* @param $path (string)
-* @return (string)
+* @param $file (string)
+* @param $path (string)
+* @return (string)
*/
function acf_get_external_dir( $file, $path = '' ) {
-
- return acf_plugin_dir_url( $file ) . $path;
-
+
+ return acf_plugin_dir_url( $file ) . $path;
+
}
/**
-* acf_plugin_dir_url
-*
-* This function will calculate the url to a plugin folder.
-* Different to the WP plugin_dir_url(), this function can calculate for urls outside of the plugins folder (theme include).
-*
-* @date 13/12/17
-* @since 5.6.8
-*
-* @param type $var Description. Default.
-* @return type Description.
-*/
+ * acf_plugin_dir_url
+ *
+ * This function will calculate the url to a plugin folder.
+ * Different to the WP plugin_dir_url(), this function can calculate for urls outside of the plugins folder (theme include).
+ *
+ * @date 13/12/17
+ * @since 5.6.8
+ *
+ * @param type $var Description. Default.
+ * @return type Description.
+ */
function acf_plugin_dir_url( $file ) {
-
+
// vars
$path = plugin_dir_path( $file );
$path = wp_normalize_path( $path );
-
-
+
// check plugins
- $check_path = wp_normalize_path( realpath(WP_PLUGIN_DIR) );
- if( strpos($path, $check_path) === 0 ) {
+ $check_path = wp_normalize_path( realpath( WP_PLUGIN_DIR ) );
+ if ( strpos( $path, $check_path ) === 0 ) {
return str_replace( $check_path, plugins_url(), $path );
}
-
+
// check wp-content
- $check_path = wp_normalize_path( realpath(WP_CONTENT_DIR) );
- if( strpos($path, $check_path) === 0 ) {
+ $check_path = wp_normalize_path( realpath( WP_CONTENT_DIR ) );
+ if ( strpos( $path, $check_path ) === 0 ) {
return str_replace( $check_path, content_url(), $path );
}
-
+
// check root
- $check_path = wp_normalize_path( realpath(ABSPATH) );
- if( strpos($path, $check_path) === 0 ) {
- return str_replace( $check_path, site_url('/'), $path );
+ $check_path = wp_normalize_path( realpath( ABSPATH ) );
+ if ( strpos( $path, $check_path ) === 0 ) {
+ return str_replace( $check_path, site_url( '/' ), $path );
}
-
-
- // return
- return plugin_dir_url( $file );
-
+
+ // return
+ return plugin_dir_url( $file );
+
}
@@ -348,28 +346,26 @@ function acf_plugin_dir_url( $file ) {
*
* This function will merge together 2 arrays and also convert any numeric values to ints
*
-* @type function
-* @date 18/10/13
-* @since 5.0.0
+* @type function
+* @date 18/10/13
+* @since 5.0.0
*
-* @param $args (array)
-* @param $defaults (array)
-* @return $args (array)
+* @param $args (array)
+* @param $defaults (array)
+* @return $args (array)
*/
function acf_parse_args( $args, $defaults = array() ) {
-
+
// parse args
$args = wp_parse_args( $args, $defaults );
-
-
+
// parse types
$args = acf_parse_types( $args );
-
-
+
// return
return $args;
-
+
}
@@ -378,12 +374,12 @@ function acf_parse_args( $args, $defaults = array() ) {
*
* This function will convert any numeric values to int and trim strings
*
-* @type function
-* @date 18/10/13
-* @since 5.0.0
+* @type function
+* @date 18/10/13
+* @since 5.0.0
*
-* @param $var (mixed)
-* @return $var (mixed)
+* @param $var (mixed)
+* @return $var (mixed)
*/
function acf_parse_types( $array ) {
@@ -396,28 +392,28 @@ function acf_parse_types( $array ) {
*
* description
*
-* @type function
-* @date 11/11/2014
-* @since 5.0.9
+* @type function
+* @date 11/11/2014
+* @since 5.0.9
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_parse_type( $v ) {
-
+
// Check if is string.
- if( is_string($v) ) {
-
+ if ( is_string( $v ) ) {
+
// Trim ("Word " = "Word").
$v = trim( $v );
-
+
// Convert int strings to int ("123" = 123).
- if( is_numeric($v) && strval(intval($v)) === $v ) {
+ if ( is_numeric( $v ) && strval( intval( $v ) ) === $v ) {
$v = intval( $v );
}
}
-
+
// return.
return $v;
}
@@ -428,33 +424,32 @@ function acf_parse_type( $v ) {
*
* This function will load in a file from the 'admin/views' folder and allow variables to be passed through
*
-* @type function
-* @date 28/09/13
-* @since 5.0.0
+* @type function
+* @date 28/09/13
+* @since 5.0.0
*
-* @param $view_name (string)
-* @param $args (array)
-* @return n/a
+* @param $view_name (string)
+* @param $args (array)
+* @return n/a
*/
function acf_get_view( $path = '', $args = array() ) {
-
+
// allow view file name shortcut
- if( substr($path, -4) !== '.php' ) {
-
- $path = acf_get_path("includes/admin/views/{$path}.php");
-
+ if ( substr( $path, -4 ) !== '.php' ) {
+
+ $path = acf_get_path( "includes/admin/views/{$path}.php" );
+
}
-
-
+
// include
- if( file_exists($path) ) {
-
+ if ( file_exists( $path ) ) {
+
extract( $args );
- include( $path );
-
+ include $path;
+
}
-
+
}
@@ -463,46 +458,44 @@ function acf_get_view( $path = '', $args = array() ) {
*
* description
*
-* @type function
-* @date 2/11/2014
-* @since 5.0.9
+* @type function
+* @date 2/11/2014
+* @since 5.0.9
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_merge_atts( $atts, $extra = array() ) {
-
+
// bail ealry if no $extra
- if( empty($extra) ) return $atts;
-
-
- // trim
- $extra = array_map('trim', $extra);
- $extra = array_filter($extra);
-
-
- // merge in new atts
- foreach( $extra as $k => $v ) {
-
- // append
- if( $k == 'class' || $k == 'style' ) {
-
- $atts[ $k ] .= ' ' . $v;
-
- // merge
- } else {
-
- $atts[ $k ] = $v;
-
- }
-
+ if ( empty( $extra ) ) {
+ return $atts;
}
-
-
+
+ // trim
+ $extra = array_map( 'trim', $extra );
+ $extra = array_filter( $extra );
+
+ // merge in new atts
+ foreach ( $extra as $k => $v ) {
+
+ // append
+ if ( $k == 'class' || $k == 'style' ) {
+
+ $atts[ $k ] .= ' ' . $v;
+
+ // merge
+ } else {
+
+ $atts[ $k ] = $v;
+
+ }
+ }
+
// return
return $atts;
-
+
}
@@ -511,18 +504,18 @@ function acf_merge_atts( $atts, $extra = array() ) {
*
* This function will create a basic nonce input
*
-* @type function
-* @date 24/5/17
-* @since 5.6.0
+* @type function
+* @date 24/5/17
+* @since 5.6.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_nonce_input( $nonce = '' ) {
-
+
echo '';
-
+
}
@@ -531,35 +524,32 @@ function acf_nonce_input( $nonce = '' ) {
*
* This function will remove the var from the array, and return the var
*
-* @type function
-* @date 2/10/13
-* @since 5.0.0
+* @type function
+* @date 2/10/13
+* @since 5.0.0
*
-* @param $array (array)
-* @param $key (string)
-* @return (mixed)
+* @param $array (array)
+* @param $key (string)
+* @return (mixed)
*/
function acf_extract_var( &$array, $key, $default = null ) {
-
+
// check if exists
// - uses array_key_exists to extract NULL values (isset will fail)
- if( is_array($array) && array_key_exists($key, $array) ) {
-
+ if ( is_array( $array ) && array_key_exists( $key, $array ) ) {
+
// store value
$v = $array[ $key ];
-
-
+
// unset
unset( $array[ $key ] );
-
-
+
// return
return $v;
-
+
}
-
-
+
// return
return $default;
}
@@ -570,24 +560,24 @@ function acf_extract_var( &$array, $key, $default = null ) {
*
* This function will remove the vars from the array, and return the vars
*
-* @type function
-* @date 8/10/13
-* @since 5.0.0
+* @type function
+* @date 8/10/13
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_extract_vars( &$array, $keys ) {
-
+
$r = array();
-
- foreach( $keys as $key ) {
-
+
+ foreach ( $keys as $key ) {
+
$r[ $key ] = acf_extract_var( $array, $key );
-
+
}
-
+
return $r;
}
@@ -597,129 +587,127 @@ function acf_extract_vars( &$array, $keys ) {
*
* This function will return a sub array of data
*
-* @type function
-* @date 15/03/2016
-* @since 5.3.2
+* @type function
+* @date 15/03/2016
+* @since 5.3.2
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_get_sub_array( $array, $keys ) {
-
+
$r = array();
-
- foreach( $keys as $key ) {
-
+
+ foreach ( $keys as $key ) {
+
$r[ $key ] = $array[ $key ];
-
+
}
-
+
return $r;
-
+
}
/**
-* acf_get_post_types
-*
-* Returns an array of post type names.
-*
-* @date 7/10/13
-* @since 5.0.0
-*
-* @param array $args Optional. An array of key => value arguments to match against the post type objects. Default empty array.
-* @return array A list of post type names.
-*/
+ * acf_get_post_types
+ *
+ * Returns an array of post type names.
+ *
+ * @date 7/10/13
+ * @since 5.0.0
+ *
+ * @param array $args Optional. An array of key => value arguments to match against the post type objects. Default empty array.
+ * @return array A list of post type names.
+ */
function acf_get_post_types( $args = array() ) {
-
+
// vars
$post_types = array();
-
+
// extract special arg
- $exclude = acf_extract_var( $args, 'exclude', array() );
+ $exclude = acf_extract_var( $args, 'exclude', array() );
$exclude[] = 'acf-field';
$exclude[] = 'acf-field-group';
-
+
// get post type objects
$objects = get_post_types( $args, 'objects' );
-
+
// loop
- foreach( $objects as $i => $object ) {
-
+ foreach ( $objects as $i => $object ) {
+
// bail early if is exclude
- if( in_array($i, $exclude) ) continue;
-
+ if ( in_array( $i, $exclude ) ) {
+ continue;
+ }
+
// bail early if is builtin (WP) private post type
// - nav_menu_item, revision, customize_changeset, etc
- if( $object->_builtin && !$object->public ) continue;
-
+ if ( $object->_builtin && ! $object->public ) {
+ continue;
+ }
+
// append
$post_types[] = $i;
}
-
+
// filter
- $post_types = apply_filters('acf/get_post_types', $post_types, $args);
-
+ $post_types = apply_filters( 'acf/get_post_types', $post_types, $args );
+
// return
return $post_types;
}
function acf_get_pretty_post_types( $post_types = array() ) {
-
+
// get post types
- if( empty($post_types) ) {
-
+ if ( empty( $post_types ) ) {
+
// get all custom post types
$post_types = acf_get_post_types();
-
+
}
-
-
+
// get labels
$ref = array();
- $r = array();
-
- foreach( $post_types as $post_type ) {
-
+ $r = array();
+
+ foreach ( $post_types as $post_type ) {
+
// vars
- $label = acf_get_post_type_label($post_type);
-
-
+ $label = acf_get_post_type_label( $post_type );
+
// append to r
$r[ $post_type ] = $label;
-
-
+
// increase counter
- if( !isset($ref[ $label ]) ) {
-
+ if ( ! isset( $ref[ $label ] ) ) {
+
$ref[ $label ] = 0;
-
+
}
-
+
$ref[ $label ]++;
}
-
-
+
// get slugs
- foreach( array_keys($r) as $i ) {
-
+ foreach ( array_keys( $r ) as $i ) {
+
// vars
$post_type = $r[ $i ];
-
- if( $ref[ $post_type ] > 1 ) {
-
+
+ if ( $ref[ $post_type ] > 1 ) {
+
$r[ $i ] .= ' (' . $i . ')';
-
+
}
-
}
-
-
+
// return
return $r;
-
+
}
@@ -729,33 +717,31 @@ function acf_get_pretty_post_types( $post_types = array() ) {
*
* This function will return a pretty label for a specific post_type
*
-* @type function
-* @date 5/07/2016
-* @since 5.4.0
+* @type function
+* @date 5/07/2016
+* @since 5.4.0
*
-* @param $post_type (string)
-* @return (string)
+* @param $post_type (string)
+* @return (string)
*/
function acf_get_post_type_label( $post_type ) {
-
+
// vars
$label = $post_type;
-
-
+
// check that object exists
// - case exists when importing field group from another install and post type does not exist
- if( post_type_exists($post_type) ) {
-
- $obj = get_post_type_object($post_type);
+ if ( post_type_exists( $post_type ) ) {
+
+ $obj = get_post_type_object( $post_type );
$label = $obj->labels->singular_name;
-
+
}
-
-
+
// return
return $label;
-
+
}
@@ -764,31 +750,30 @@ function acf_get_post_type_label( $post_type ) {
*
* This function will look at the $_POST['_acf_nonce'] value and return true or false
*
-* @type function
-* @date 15/10/13
-* @since 5.0.0
+* @type function
+* @date 15/10/13
+* @since 5.0.0
*
-* @param $nonce (string)
-* @return (boolean)
+* @param $nonce (string)
+* @return (boolean)
*/
-function acf_verify_nonce( $value) {
-
+function acf_verify_nonce( $value ) {
+
// vars
- $nonce = acf_maybe_get_POST('_acf_nonce');
-
-
+ $nonce = acf_maybe_get_POST( '_acf_nonce' );
+
// bail early nonce does not match (post|user|comment|term)
- if( !$nonce || !wp_verify_nonce($nonce, $value) ) return false;
-
-
+ if ( ! $nonce || ! wp_verify_nonce( $nonce, $value ) ) {
+ return false;
+ }
+
// reset nonce (only allow 1 save)
$_POST['_acf_nonce'] = false;
-
-
+
// return
return true;
-
+
}
@@ -798,27 +783,27 @@ function acf_verify_nonce( $value) {
* This function will return true if the current AJAX request is valid
* It's action will also allow WPML to set the lang and avoid AJAX get_posts issues
*
-* @type function
-* @date 7/08/2015
-* @since 5.2.3
+* @type function
+* @date 7/08/2015
+* @since 5.2.3
*
-* @param n/a
-* @return (boolean)
+* @param n/a
+* @return (boolean)
*/
function acf_verify_ajax() {
-
+
// vars
- $nonce = isset($_REQUEST['nonce']) ? $_REQUEST['nonce'] : '';
-
+ $nonce = isset( $_REQUEST['nonce'] ) ? $_REQUEST['nonce'] : '';
+
// bail early if not acf nonce
- if( !$nonce || !wp_verify_nonce($nonce, 'acf_nonce') ) {
+ if ( ! $nonce || ! wp_verify_nonce( $nonce, 'acf_nonce' ) ) {
return false;
}
-
+
// action for 3rd party customization
- do_action('acf/verify_ajax');
-
+ do_action( 'acf/verify_ajax' );
+
// return
return true;
}
@@ -829,101 +814,88 @@ function acf_verify_ajax() {
*
* This function will return an array of available image sizes
*
-* @type function
-* @date 23/10/13
-* @since 5.0.0
+* @type function
+* @date 23/10/13
+* @since 5.0.0
*
-* @param n/a
-* @return (array)
+* @param n/a
+* @return (array)
*/
function acf_get_image_sizes() {
-
+
// vars
$sizes = array(
- 'thumbnail' => __("Thumbnail",'acf'),
- 'medium' => __("Medium",'acf'),
- 'large' => __("Large",'acf')
+ 'thumbnail' => __( 'Thumbnail', 'acf' ),
+ 'medium' => __( 'Medium', 'acf' ),
+ 'large' => __( 'Large', 'acf' ),
);
-
-
+
// find all sizes
$all_sizes = get_intermediate_image_sizes();
-
-
+
// add extra registered sizes
- if( !empty($all_sizes) ) {
-
- foreach( $all_sizes as $size ) {
-
+ if ( ! empty( $all_sizes ) ) {
+
+ foreach ( $all_sizes as $size ) {
+
// bail early if already in array
- if( isset($sizes[ $size ]) ) {
-
+ if ( isset( $sizes[ $size ] ) ) {
+
continue;
-
+
}
-
-
+
// append to array
- $label = str_replace('-', ' ', $size);
- $label = ucwords( $label );
+ $label = str_replace( '-', ' ', $size );
+ $label = ucwords( $label );
$sizes[ $size ] = $label;
-
+
}
-
}
-
-
+
// add sizes
- foreach( array_keys($sizes) as $s ) {
-
+ foreach ( array_keys( $sizes ) as $s ) {
+
// vars
- $data = acf_get_image_size($s);
-
-
+ $data = acf_get_image_size( $s );
+
// append
- if( $data['width'] && $data['height'] ) {
-
+ if ( $data['width'] && $data['height'] ) {
+
$sizes[ $s ] .= ' (' . $data['width'] . ' x ' . $data['height'] . ')';
-
+
}
-
}
-
-
+
// add full end
- $sizes['full'] = __("Full Size",'acf');
-
-
+ $sizes['full'] = __( 'Full Size', 'acf' );
+
// filter for 3rd party customization
$sizes = apply_filters( 'acf/get_image_sizes', $sizes );
-
-
+
// return
return $sizes;
-
+
}
function acf_get_image_size( $s = '' ) {
-
+
// global
global $_wp_additional_image_sizes;
-
-
+
// rename for nicer code
$_sizes = $_wp_additional_image_sizes;
-
-
+
// vars
$data = array(
- 'width' => isset($_sizes[$s]['width']) ? $_sizes[$s]['width'] : get_option("{$s}_size_w"),
- 'height' => isset($_sizes[$s]['height']) ? $_sizes[$s]['height'] : get_option("{$s}_size_h")
+ 'width' => isset( $_sizes[ $s ]['width'] ) ? $_sizes[ $s ]['width'] : get_option( "{$s}_size_w" ),
+ 'height' => isset( $_sizes[ $s ]['height'] ) ? $_sizes[ $s ]['height'] : get_option( "{$s}_size_h" ),
);
-
-
+
// return
return $data;
-
+
}
/**
@@ -931,22 +903,22 @@ function acf_get_image_size( $s = '' ) {
*
* Similar to the version_compare() function but with extra functionality.
*
- * @date 21/11/16
- * @since 5.5.0
+ * @date 21/11/16
+ * @since 5.5.0
*
- * @param string $left The left version number.
- * @param string $compare The compare operator.
- * @param string $right The right version number.
- * @return bool
+ * @param string $left The left version number.
+ * @param string $compare The compare operator.
+ * @param string $right The right version number.
+ * @return bool
*/
function acf_version_compare( $left = '', $compare = '>', $right = '' ) {
-
+
// Detect 'wp' placeholder.
- if( $left === 'wp' ) {
+ if ( $left === 'wp' ) {
global $wp_version;
$left = $wp_version;
}
-
+
// Return result.
return version_compare( $left, $right, $compare );
}
@@ -957,27 +929,26 @@ function acf_version_compare( $left = '', $compare = '>', $right = '' ) {
*
* This function will remove any '-beta1' or '-RC1' strings from a version
*
-* @type function
-* @date 24/11/16
-* @since 5.5.0
+* @type function
+* @date 24/11/16
+* @since 5.5.0
*
-* @param $version (string)
-* @return (string)
+* @param $version (string)
+* @return (string)
*/
function acf_get_full_version( $version = '1' ) {
-
+
// remove '-beta1' or '-RC1'
- if( $pos = strpos($version, '-') ) {
-
- $version = substr($version, 0, $pos);
-
+ if ( $pos = strpos( $version, '-' ) ) {
+
+ $version = substr( $version, 0, $pos );
+
}
-
-
+
// return
return $version;
-
+
}
@@ -986,28 +957,31 @@ function acf_get_full_version( $version = '1' ) {
*
* This function is a wrapper for the get_terms() function
*
-* @type function
-* @date 28/09/2016
-* @since 5.4.0
+* @type function
+* @date 28/09/2016
+* @since 5.4.0
*
-* @param $args (array)
-* @return (array)
+* @param $args (array)
+* @return (array)
*/
function acf_get_terms( $args ) {
-
+
// defaults
- $args = wp_parse_args($args, array(
- 'taxonomy' => null,
- 'hide_empty' => false,
- 'update_term_meta_cache' => false,
- ));
-
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'taxonomy' => null,
+ 'hide_empty' => false,
+ 'update_term_meta_cache' => false,
+ )
+ );
+
// parameters changed in version 4.5
- if( acf_version_compare('wp', '<', '4.5') ) {
+ if ( acf_version_compare( 'wp', '<', '4.5' ) ) {
return get_terms( $args['taxonomy'], $args );
}
-
+
// return
return get_terms( $args );
}
@@ -1018,70 +992,65 @@ function acf_get_terms( $args ) {
*
* This function will return an array of available taxonomy terms
*
-* @type function
-* @date 7/10/13
-* @since 5.0.0
+* @type function
+* @date 7/10/13
+* @since 5.0.0
*
-* @param $taxonomies (array)
-* @return (array)
+* @param $taxonomies (array)
+* @return (array)
*/
function acf_get_taxonomy_terms( $taxonomies = array() ) {
-
+
// force array
$taxonomies = acf_get_array( $taxonomies );
-
-
+
// get pretty taxonomy names
$taxonomies = acf_get_pretty_taxonomies( $taxonomies );
-
-
+
// vars
$r = array();
-
-
+
// populate $r
- foreach( array_keys($taxonomies) as $taxonomy ) {
-
+ foreach ( array_keys( $taxonomies ) as $taxonomy ) {
+
// vars
- $label = $taxonomies[ $taxonomy ];
+ $label = $taxonomies[ $taxonomy ];
$is_hierarchical = is_taxonomy_hierarchical( $taxonomy );
- $terms = acf_get_terms(array(
- 'taxonomy' => $taxonomy,
- 'hide_empty' => false
- ));
-
-
+ $terms = acf_get_terms(
+ array(
+ 'taxonomy' => $taxonomy,
+ 'hide_empty' => false,
+ )
+ );
+
// bail early i no terms
- if( empty($terms) ) continue;
-
-
+ if ( empty( $terms ) ) {
+ continue;
+ }
+
// sort into hierachial order!
- if( $is_hierarchical ) {
-
+ if ( $is_hierarchical ) {
+
$terms = _get_term_children( 0, $terms, $taxonomy );
-
+
}
-
-
- // add placeholder
+
+ // add placeholder
$r[ $label ] = array();
-
-
+
// add choices
- foreach( $terms as $term ) {
-
- $k = "{$taxonomy}:{$term->slug}";
+ foreach ( $terms as $term ) {
+
+ $k = "{$taxonomy}:{$term->slug}";
$r[ $label ][ $k ] = acf_get_term_title( $term );
-
+
}
-
}
-
-
+
// return
return $r;
-
+
}
@@ -1090,50 +1059,47 @@ function acf_get_taxonomy_terms( $taxonomies = array() ) {
*
* This function decodes the $taxonomy:$term strings into a nested array
*
-* @type function
-* @date 27/02/2014
-* @since 5.0.0
+* @type function
+* @date 27/02/2014
+* @since 5.0.0
*
-* @param $terms (array)
-* @return (array)
+* @param $terms (array)
+* @return (array)
*/
function acf_decode_taxonomy_terms( $strings = false ) {
-
+
// bail early if no terms
- if( empty($strings) ) return false;
-
-
+ if ( empty( $strings ) ) {
+ return false;
+ }
+
// vars
$terms = array();
-
-
+
// loop
- foreach( $strings as $string ) {
-
+ foreach ( $strings as $string ) {
+
// vars
- $data = acf_decode_taxonomy_term( $string );
+ $data = acf_decode_taxonomy_term( $string );
$taxonomy = $data['taxonomy'];
- $term = $data['term'];
-
-
+ $term = $data['term'];
+
// create empty array
- if( !isset($terms[ $taxonomy ]) ) {
-
+ if ( ! isset( $terms[ $taxonomy ] ) ) {
+
$terms[ $taxonomy ] = array();
-
+
}
-
-
+
// append
$terms[ $taxonomy ][] = $term;
-
+
}
-
-
+
// return
return $terms;
-
+
}
@@ -1142,80 +1108,76 @@ function acf_decode_taxonomy_terms( $strings = false ) {
*
* This function will return the taxonomy and term slug for a given value
*
-* @type function
-* @date 31/03/2014
-* @since 5.0.0
+* @type function
+* @date 31/03/2014
+* @since 5.0.0
*
-* @param $string (string)
-* @return (array)
+* @param $string (string)
+* @return (array)
*/
function acf_decode_taxonomy_term( $value ) {
-
+
// vars
$data = array(
- 'taxonomy' => '',
- 'term' => ''
+ 'taxonomy' => '',
+ 'term' => '',
);
-
-
+
// int
- if( is_numeric($value) ) {
-
+ if ( is_numeric( $value ) ) {
+
$data['term'] = $value;
-
- // string
- } elseif( is_string($value) ) {
-
- $value = explode(':', $value);
- $data['taxonomy'] = isset($value[0]) ? $value[0] : '';
- $data['term'] = isset($value[1]) ? $value[1] : '';
-
- // error
+
+ // string
+ } elseif ( is_string( $value ) ) {
+
+ $value = explode( ':', $value );
+ $data['taxonomy'] = isset( $value[0] ) ? $value[0] : '';
+ $data['term'] = isset( $value[1] ) ? $value[1] : '';
+
+ // error
} else {
-
+
return false;
-
+
}
-
-
+
// allow for term_id (Used by ACF v4)
- if( is_numeric($data['term']) ) {
-
+ if ( is_numeric( $data['term'] ) ) {
+
// global
global $wpdb;
-
-
+
// find taxonomy
- if( !$data['taxonomy'] ) {
-
- $data['taxonomy'] = $wpdb->get_var( $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $data['term']) );
-
+ if ( ! $data['taxonomy'] ) {
+
+ $data['taxonomy'] = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $data['term'] ) );
+
}
-
-
+
// find term (may have numeric slug '123')
$term = get_term_by( 'slug', $data['term'], $data['taxonomy'] );
-
-
+
// attempt get term via ID (ACF4 uses ID)
- if( !$term ) $term = get_term( $data['term'], $data['taxonomy'] );
-
-
+ if ( ! $term ) {
+ $term = get_term( $data['term'], $data['taxonomy'] );
+ }
+
// bail early if no term
- if( !$term ) return false;
-
-
+ if ( ! $term ) {
+ return false;
+ }
+
// update
$data['taxonomy'] = $term->taxonomy;
- $data['term'] = $term->slug;
-
+ $data['term'] = $term->slug;
+
}
-
-
+
// return
return $data;
-
+
}
/**
@@ -1223,11 +1185,11 @@ function acf_decode_taxonomy_term( $value ) {
*
* Casts the value into an array.
*
- * @date 9/1/19
- * @since 5.7.10
+ * @date 9/1/19
+ * @since 5.7.10
*
- * @param mixed $val The value to cast.
- * @return array
+ * @param mixed $val The value to cast.
+ * @return array
*/
function acf_array( $val = array() ) {
return (array) $val;
@@ -1236,14 +1198,14 @@ function acf_array( $val = array() ) {
/**
* Returns a non-array value.
*
- * @date 11/05/2020
- * @since 5.8.10
+ * @date 11/05/2020
+ * @since 5.8.10
*
- * @param mixed $val The value to review.
- * @return mixed
+ * @param mixed $val The value to review.
+ * @return mixed
*/
function acf_unarray( $val ) {
- if( is_array( $val ) ) {
+ if ( is_array( $val ) ) {
return reset( $val );
}
return $val;
@@ -1254,37 +1216,34 @@ function acf_unarray( $val ) {
*
* This function will force a variable to become an array
*
-* @type function
-* @date 4/02/2014
-* @since 5.0.0
+* @type function
+* @date 4/02/2014
+* @since 5.0.0
*
-* @param $var (mixed)
-* @return (array)
+* @param $var (mixed)
+* @return (array)
*/
function acf_get_array( $var = false, $delimiter = '' ) {
-
+
// array
- if( is_array($var) ) {
+ if ( is_array( $var ) ) {
return $var;
}
-
-
+
// bail early if empty
- if( acf_is_empty($var) ) {
+ if ( acf_is_empty( $var ) ) {
return array();
}
-
-
- // string
- if( is_string($var) && $delimiter ) {
- return explode($delimiter, $var);
+
+ // string
+ if ( is_string( $var ) && $delimiter ) {
+ return explode( $delimiter, $var );
}
-
-
+
// place in array
return (array) $var;
-
+
}
@@ -1293,40 +1252,41 @@ function acf_get_array( $var = false, $delimiter = '' ) {
*
* This function will return numeric values
*
-* @type function
-* @date 15/07/2016
-* @since 5.4.0
+* @type function
+* @date 15/07/2016
+* @since 5.4.0
*
-* @param $value (mixed)
-* @return (mixed)
+* @param $value (mixed)
+* @return (mixed)
*/
function acf_get_numeric( $value = '' ) {
-
+
// vars
- $numbers = array();
- $is_array = is_array($value);
-
-
+ $numbers = array();
+ $is_array = is_array( $value );
+
// loop
- foreach( (array) $value as $v ) {
-
- if( is_numeric($v) ) $numbers[] = (int) $v;
-
+ foreach ( (array) $value as $v ) {
+
+ if ( is_numeric( $v ) ) {
+ $numbers[] = (int) $v;
+ }
}
-
-
+
// bail early if is empty
- if( empty($numbers) ) return false;
-
-
+ if ( empty( $numbers ) ) {
+ return false;
+ }
+
// convert array
- if( !$is_array ) $numbers = $numbers[0];
-
-
+ if ( ! $is_array ) {
+ $numbers = $numbers[0];
+ }
+
// return
return $numbers;
-
+
}
@@ -1335,53 +1295,56 @@ function acf_get_numeric( $value = '' ) {
*
* Similar to the get_posts() function but with extra functionality.
*
- * @date 3/03/15
- * @since 5.1.5
+ * @date 3/03/15
+ * @since 5.1.5
*
- * @param array $args The query args.
- * @return array
+ * @param array $args The query args.
+ * @return array
*/
function acf_get_posts( $args = array() ) {
-
+
// Vars.
$posts = array();
-
+
// Apply default args.
- $args = wp_parse_args($args, array(
- 'posts_per_page' => -1,
- 'post_type' => '',
- 'post_status' => 'any',
- 'update_post_meta_cache' => false,
- 'update_post_term_cache' => false
- ));
-
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'posts_per_page' => -1,
+ 'post_type' => '',
+ 'post_status' => 'any',
+ 'update_post_meta_cache' => false,
+ 'update_post_term_cache' => false,
+ )
+ );
+
// Avoid default 'post' post_type by providing all public types.
- if( !$args['post_type'] ) {
+ if ( ! $args['post_type'] ) {
$args['post_type'] = acf_get_post_types();
}
-
+
// Check if specifc post ID's have been provided.
- if( $args['post__in'] ) {
-
+ if ( $args['post__in'] ) {
+
// Clean value into an array of IDs.
- $args['post__in'] = array_map('intval', acf_array($args['post__in']));
+ $args['post__in'] = array_map( 'intval', acf_array( $args['post__in'] ) );
}
-
+
// Query posts.
$posts = get_posts( $args );
-
+
// Remove any potential empty results.
$posts = array_filter( $posts );
-
+
// Manually order results.
- if( $posts && $args['post__in'] ) {
+ if ( $posts && $args['post__in'] ) {
$order = array();
- foreach( $posts as $i => $post ) {
+ foreach ( $posts as $i => $post ) {
$order[ $i ] = array_search( $post->ID, $args['post__in'] );
}
- array_multisort($order, $posts);
+ array_multisort( $order, $posts );
}
-
+
// Return posts.
return $posts;
}
@@ -1393,52 +1356,46 @@ function acf_get_posts( $args = array() ) {
* This function will remove the 'wp_posts.post_type' WHERE clause completely
* When using 'post__in', this clause is unneccessary and slow.
*
-* @type function
-* @date 4/03/2015
-* @since 5.1.5
+* @type function
+* @date 4/03/2015
+* @since 5.1.5
*
-* @param $sql (string)
-* @return $sql
+* @param $sql (string)
+* @return $sql
*/
function _acf_query_remove_post_type( $sql ) {
-
+
// global
global $wpdb;
-
-
+
// bail ealry if no 'wp_posts.ID IN'
- if( strpos($sql, "$wpdb->posts.ID IN") === false ) {
-
+ if ( strpos( $sql, "$wpdb->posts.ID IN" ) === false ) {
+
return $sql;
-
+
}
-
-
- // get bits
+
+ // get bits
$glue = 'AND';
- $bits = explode($glue, $sql);
-
-
+ $bits = explode( $glue, $sql );
+
// loop through $where and remove any post_type queries
- foreach( $bits as $i => $bit ) {
-
- if( strpos($bit, "$wpdb->posts.post_type") !== false ) {
-
+ foreach ( $bits as $i => $bit ) {
+
+ if ( strpos( $bit, "$wpdb->posts.post_type" ) !== false ) {
+
unset( $bits[ $i ] );
-
+
}
-
}
-
-
+
// join $where back together
- $sql = implode($glue, $bits);
-
-
- // return
- return $sql;
-
+ $sql = implode( $glue, $bits );
+
+ // return
+ return $sql;
+
}
@@ -1448,303 +1405,277 @@ function _acf_query_remove_post_type( $sql ) {
* This function will return all posts grouped by post_type
* This is handy for select settings
*
-* @type function
-* @date 27/02/2014
-* @since 5.0.0
+* @type function
+* @date 27/02/2014
+* @since 5.0.0
*
-* @param $args (array)
-* @return (array)
+* @param $args (array)
+* @return (array)
*/
function acf_get_grouped_posts( $args ) {
-
+
// vars
$data = array();
-
-
- // defaults
- $args = wp_parse_args( $args, array(
- 'posts_per_page' => -1,
- 'paged' => 0,
- 'post_type' => 'post',
- 'orderby' => 'menu_order title',
- 'order' => 'ASC',
- 'post_status' => 'any',
- 'suppress_filters' => false,
- 'update_post_meta_cache' => false,
- ));
-
+ // defaults
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'posts_per_page' => -1,
+ 'paged' => 0,
+ 'post_type' => 'post',
+ 'orderby' => 'menu_order title',
+ 'order' => 'ASC',
+ 'post_status' => 'any',
+ 'suppress_filters' => false,
+ 'update_post_meta_cache' => false,
+ )
+ );
+
// find array of post_type
- $post_types = acf_get_array( $args['post_type'] );
- $post_types_labels = acf_get_pretty_post_types($post_types);
- $is_single_post_type = ( count($post_types) == 1 );
-
-
+ $post_types = acf_get_array( $args['post_type'] );
+ $post_types_labels = acf_get_pretty_post_types( $post_types );
+ $is_single_post_type = ( count( $post_types ) == 1 );
+
// attachment doesn't work if it is the only item in an array
- if( $is_single_post_type ) {
- $args['post_type'] = reset($post_types);
+ if ( $is_single_post_type ) {
+ $args['post_type'] = reset( $post_types );
}
-
-
+
// add filter to orderby post type
- if( !$is_single_post_type ) {
- add_filter('posts_orderby', '_acf_orderby_post_type', 10, 2);
+ if ( ! $is_single_post_type ) {
+ add_filter( 'posts_orderby', '_acf_orderby_post_type', 10, 2 );
}
-
-
+
// get posts
$posts = get_posts( $args );
-
-
+
// remove this filter (only once)
- if( !$is_single_post_type ) {
- remove_filter('posts_orderby', '_acf_orderby_post_type', 10, 2);
+ if ( ! $is_single_post_type ) {
+ remove_filter( 'posts_orderby', '_acf_orderby_post_type', 10, 2 );
}
-
-
+
// loop
- foreach( $post_types as $post_type ) {
-
+ foreach ( $post_types as $post_type ) {
+
// vars
$this_posts = array();
$this_group = array();
-
-
+
// populate $this_posts
- foreach( $posts as $post ) {
- if( $post->post_type == $post_type ) {
+ foreach ( $posts as $post ) {
+ if ( $post->post_type == $post_type ) {
$this_posts[] = $post;
}
}
-
-
+
// bail early if no posts for this post type
- if( empty($this_posts) ) continue;
-
-
+ if ( empty( $this_posts ) ) {
+ continue;
+ }
+
// sort into hierachial order!
// this will fail if a search has taken place because parents wont exist
- if( is_post_type_hierarchical($post_type) && empty($args['s'])) {
-
+ if ( is_post_type_hierarchical( $post_type ) && empty( $args['s'] ) ) {
+
// vars
- $post_id = $this_posts[0]->ID;
- $parent_id = acf_maybe_get($args, 'post_parent', 0);
- $offset = 0;
- $length = count($this_posts);
-
-
+ $post_id = $this_posts[0]->ID;
+ $parent_id = acf_maybe_get( $args, 'post_parent', 0 );
+ $offset = 0;
+ $length = count( $this_posts );
+
// get all posts from this post type
- $all_posts = get_posts(array_merge($args, array(
- 'posts_per_page' => -1,
- 'paged' => 0,
- 'post_type' => $post_type
- )));
-
-
+ $all_posts = get_posts(
+ array_merge(
+ $args,
+ array(
+ 'posts_per_page' => -1,
+ 'paged' => 0,
+ 'post_type' => $post_type,
+ )
+ )
+ );
+
// find starting point (offset)
- foreach( $all_posts as $i => $post ) {
- if( $post->ID == $post_id ) {
+ foreach ( $all_posts as $i => $post ) {
+ if ( $post->ID == $post_id ) {
$offset = $i;
break;
}
}
-
-
+
// order posts
- $ordered_posts = get_page_children($parent_id, $all_posts);
-
-
+ $ordered_posts = get_page_children( $parent_id, $all_posts );
+
// compare aray lengths
// if $ordered_posts is smaller than $all_posts, WP has lost posts during the get_page_children() function
- // this is possible when get_post( $args ) filter out parents (via taxonomy, meta and other search parameters)
- if( count($ordered_posts) == count($all_posts) ) {
- $this_posts = array_slice($ordered_posts, $offset, $length);
+ // this is possible when get_post( $args ) filter out parents (via taxonomy, meta and other search parameters)
+ if ( count( $ordered_posts ) == count( $all_posts ) ) {
+ $this_posts = array_slice( $ordered_posts, $offset, $length );
}
-
}
-
-
+
// populate $this_posts
- foreach( $this_posts as $post ) {
+ foreach ( $this_posts as $post ) {
$this_group[ $post->ID ] = $post;
}
-
-
+
// group by post type
- $label = $post_types_labels[ $post_type ];
+ $label = $post_types_labels[ $post_type ];
$data[ $label ] = $this_group;
-
+
}
-
-
+
// return
return $data;
-
+
}
function _acf_orderby_post_type( $ordeby, $wp_query ) {
-
+
// global
global $wpdb;
-
-
+
// get post types
- $post_types = $wp_query->get('post_type');
-
+ $post_types = $wp_query->get( 'post_type' );
// prepend SQL
- if( is_array($post_types) ) {
-
- $post_types = implode("','", $post_types);
- $ordeby = "FIELD({$wpdb->posts}.post_type,'$post_types')," . $ordeby;
-
+ if ( is_array( $post_types ) ) {
+
+ $post_types = implode( "','", $post_types );
+ $ordeby = "FIELD({$wpdb->posts}.post_type,'$post_types')," . $ordeby;
+
}
-
-
+
// return
return $ordeby;
-
+
}
function acf_get_post_title( $post = 0, $is_search = false ) {
-
+
// vars
- $post = get_post($post);
- $title = '';
+ $post = get_post( $post );
+ $title = '';
$prepend = '';
- $append = '';
-
-
+ $append = '';
+
// bail early if no post
- if( !$post ) return '';
-
-
+ if ( ! $post ) {
+ return '';
+ }
+
// title
$title = get_the_title( $post->ID );
-
-
+
// empty
- if( $title === '' ) {
-
- $title = __('(no title)', 'acf');
-
+ if ( $title === '' ) {
+
+ $title = __( '(no title)', 'acf' );
+
}
-
-
+
// status
- if( get_post_status( $post->ID ) != "publish" ) {
-
+ if ( get_post_status( $post->ID ) != 'publish' ) {
+
$append .= ' (' . get_post_status( $post->ID ) . ')';
-
+
}
-
-
+
// ancestors
- if( $post->post_type !== 'attachment' ) {
-
+ if ( $post->post_type !== 'attachment' ) {
+
// get ancestors
$ancestors = get_ancestors( $post->ID, $post->post_type );
- $prepend .= str_repeat('- ', count($ancestors));
-
-
+ $prepend .= str_repeat( '- ', count( $ancestors ) );
+
// add parent
-/*
+ /*
removed in 5.6.5 as not used by the UI
if( $is_search && !empty($ancestors) ) {
-
+
// reverse
$ancestors = array_reverse($ancestors);
-
-
+
+
// convert id's into titles
foreach( $ancestors as $i => $id ) {
-
+
$ancestors[ $i ] = get_the_title( $id );
-
+
}
-
-
+
+
// append
$append .= ' | ' . __('Parent', 'acf') . ': ' . implode(' / ', $ancestors);
-
+
}
-*/
-
+ */
+
}
-
-
+
// merge
$title = $prepend . $title . $append;
-
-
+
// return
return $title;
-
+
}
function acf_order_by_search( $array, $search ) {
-
+
// vars
$weights = array();
- $needle = strtolower( $search );
-
-
- // add key prefix
- foreach( array_keys($array) as $k ) {
-
- $array[ '_' . $k ] = acf_extract_var( $array, $k );
-
- }
+ $needle = strtolower( $search );
+ // add key prefix
+ foreach ( array_keys( $array ) as $k ) {
+
+ $array[ '_' . $k ] = acf_extract_var( $array, $k );
+
+ }
// add search weight
- foreach( $array as $k => $v ) {
-
+ foreach ( $array as $k => $v ) {
+
// vars
- $weight = 0;
+ $weight = 0;
$haystack = strtolower( $v );
- $strpos = strpos( $haystack, $needle );
-
-
+ $strpos = strpos( $haystack, $needle );
+
// detect search match
- if( $strpos !== false ) {
-
+ if ( $strpos !== false ) {
+
// set eright to length of match
$weight = strlen( $search );
-
-
+
// increase weight if match starts at begining of string
- if( $strpos == 0 ) {
-
+ if ( $strpos == 0 ) {
+
$weight++;
-
+
}
-
}
-
-
+
// append to wights
$weights[ $k ] = $weight;
-
+
}
-
-
+
// sort the array with menu_order ascending
array_multisort( $weights, SORT_DESC, $array );
-
-
+
// remove key prefix
- foreach( array_keys($array) as $k ) {
-
- $array[ substr($k,1) ] = acf_extract_var( $array, $k );
-
+ foreach ( array_keys( $array ) as $k ) {
+
+ $array[ substr( $k, 1 ) ] = acf_extract_var( $array, $k );
+
}
-
-
+
// return
return $array;
}
@@ -1755,38 +1686,37 @@ function acf_order_by_search( $array, $search ) {
*
* description
*
-* @type function
-* @date 23/02/2016
-* @since 5.3.2
+* @type function
+* @date 23/02/2016
+* @since 5.3.2
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_get_pretty_user_roles( $allowed = false ) {
-
+
// vars
$editable_roles = get_editable_roles();
- $allowed = acf_get_array($allowed);
- $roles = array();
-
-
+ $allowed = acf_get_array( $allowed );
+ $roles = array();
+
// loop
- foreach( $editable_roles as $role_name => $role_details ) {
-
+ foreach ( $editable_roles as $role_name => $role_details ) {
+
// bail early if not allowed
- if( !empty($allowed) && !in_array($role_name, $allowed) ) continue;
-
-
+ if ( ! empty( $allowed ) && ! in_array( $role_name, $allowed ) ) {
+ continue;
+ }
+
// append
$roles[ $role_name ] = translate_user_role( $role_details['name'] );
-
+
}
-
-
+
// return
return $roles;
-
+
}
@@ -1796,153 +1726,142 @@ function acf_get_pretty_user_roles( $allowed = false ) {
* This function will return all users grouped by role
* This is handy for select settings
*
-* @type function
-* @date 27/02/2014
-* @since 5.0.0
+* @type function
+* @date 27/02/2014
+* @since 5.0.0
*
-* @param $args (array)
-* @return (array)
+* @param $args (array)
+* @return (array)
*/
function acf_get_grouped_users( $args = array() ) {
-
+
// vars
$r = array();
-
-
+
// defaults
- $args = wp_parse_args( $args, array(
- 'users_per_page' => -1,
- 'paged' => 0,
- 'role' => '',
- 'orderby' => 'login',
- 'order' => 'ASC',
- ));
-
-
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'users_per_page' => -1,
+ 'paged' => 0,
+ 'role' => '',
+ 'orderby' => 'login',
+ 'order' => 'ASC',
+ )
+ );
+
// offset
- $i = 0;
- $min = 0;
- $max = 0;
- $users_per_page = acf_extract_var($args, 'users_per_page');
- $paged = acf_extract_var($args, 'paged');
-
- if( $users_per_page > 0 ) {
-
+ $i = 0;
+ $min = 0;
+ $max = 0;
+ $users_per_page = acf_extract_var( $args, 'users_per_page' );
+ $paged = acf_extract_var( $args, 'paged' );
+
+ if ( $users_per_page > 0 ) {
+
// prevent paged from being -1
- $paged = max(0, $paged);
-
-
+ $paged = max( 0, $paged );
+
// set min / max
- $min = (($paged-1) * $users_per_page) + 1; // 1, 11
- $max = ($paged * $users_per_page); // 10, 20
-
+ $min = ( ( $paged - 1 ) * $users_per_page ) + 1; // 1, 11
+ $max = ( $paged * $users_per_page ); // 10, 20
+
}
-
-
+
// find array of post_type
- $user_roles = acf_get_pretty_user_roles($args['role']);
-
-
+ $user_roles = acf_get_pretty_user_roles( $args['role'] );
+
// fix role
- if( is_array($args['role']) ) {
-
+ if ( is_array( $args['role'] ) ) {
+
// global
- global $wp_version, $wpdb;
-
-
+ global $wp_version, $wpdb;
+
// vars
- $roles = acf_extract_var($args, 'role');
-
-
+ $roles = acf_extract_var( $args, 'role' );
+
// new WP has role__in
- if( version_compare($wp_version, '4.4', '>=' ) ) {
-
+ if ( version_compare( $wp_version, '4.4', '>=' ) ) {
+
$args['role__in'] = $roles;
-
- // old WP doesn't have role__in
+
+ // old WP doesn't have role__in
} else {
-
+
// vars
- $blog_id = get_current_blog_id();
+ $blog_id = get_current_blog_id();
$meta_query = array( 'relation' => 'OR' );
-
-
+
// loop
- foreach( $roles as $role ) {
-
+ foreach ( $roles as $role ) {
+
$meta_query[] = array(
'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
'value' => '"' . $role . '"',
'compare' => 'LIKE',
);
-
+
}
-
-
+
// append
$args['meta_query'] = $meta_query;
-
+
}
-
}
-
-
+
// get posts
$users = get_users( $args );
-
-
+
// loop
- foreach( $user_roles as $user_role_name => $user_role_label ) {
-
+ foreach ( $user_roles as $user_role_name => $user_role_label ) {
+
// vars
$this_users = array();
$this_group = array();
-
-
+
// populate $this_posts
- foreach( array_keys($users) as $key ) {
-
+ foreach ( array_keys( $users ) as $key ) {
+
// bail ealry if not correct role
- if( !in_array($user_role_name, $users[ $key ]->roles) ) continue;
-
-
+ if ( ! in_array( $user_role_name, $users[ $key ]->roles ) ) {
+ continue;
+ }
+
// extract user
$user = acf_extract_var( $users, $key );
-
-
+
// increase
$i++;
-
-
+
// bail ealry if too low
- if( $min && $i < $min ) continue;
-
-
+ if ( $min && $i < $min ) {
+ continue;
+ }
+
// bail early if too high (don't bother looking at any more users)
- if( $max && $i > $max ) break;
-
-
+ if ( $max && $i > $max ) {
+ break;
+ }
+
// group by post type
$this_users[ $user->ID ] = $user;
-
-
+
}
-
-
+
// bail early if no posts for this post type
- if( empty($this_users) ) continue;
-
-
+ if ( empty( $this_users ) ) {
+ continue;
+ }
+
// append
$r[ $user_role_label ] = $this_users;
-
+
}
-
-
+
// return
return $r;
-
+
}
/**
@@ -1950,14 +1869,14 @@ function acf_get_grouped_users( $args = array() ) {
*
* Returns json_encode() ready for file / database use.
*
- * @date 29/4/19
- * @since 5.0.0
+ * @date 29/4/19
+ * @since 5.0.0
*
- * @param array $json The array of data to encode.
- * @return string
+ * @param array $json The array of data to encode.
+ * @return string
*/
function acf_json_encode( $json ) {
- return json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
+ return json_encode( $json, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE );
}
@@ -1966,25 +1885,24 @@ function acf_json_encode( $json ) {
*
* This function will return true if a sub string is found
*
-* @type function
-* @date 1/05/2014
-* @since 5.0.0
+* @type function
+* @date 1/05/2014
+* @since 5.0.0
*
-* @param $needle (string)
-* @param $haystack (string)
-* @return (boolean)
+* @param $needle (string)
+* @param $haystack (string)
+* @return (boolean)
*/
function acf_str_exists( $needle, $haystack ) {
-
+
// return true if $haystack contains the $needle
- if( is_string($haystack) && strpos($haystack, $needle) !== false ) {
-
+ if ( is_string( $haystack ) && strpos( $haystack, $needle ) !== false ) {
+
return true;
-
+
}
-
-
+
// return
return false;
}
@@ -1995,75 +1913,72 @@ function acf_str_exists( $needle, $haystack ) {
*
* description
*
-* @type function
-* @date 2/05/2014
-* @since 5.0.0
+* @type function
+* @date 2/05/2014
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_debug() {
-
+
// vars
$args = func_get_args();
- $s = array_shift($args);
- $o = '';
- $nl = "\r\n";
-
-
+ $s = array_shift( $args );
+ $o = '';
+ $nl = "\r\n";
+
// start script
$o .= '' . $nl;
-
-
+
// echo
echo $o;
}
function acf_debug_start() {
-
- acf_update_setting( 'debug_start', memory_get_usage());
-
+
+ acf_update_setting( 'debug_start', memory_get_usage() );
+
}
function acf_debug_end() {
-
+
$start = acf_get_setting( 'debug_start' );
- $end = memory_get_usage();
-
+ $end = memory_get_usage();
+
return $end - $start;
-
+
}
@@ -2072,124 +1987,116 @@ function acf_debug_end() {
*
* description
*
-* @type function
-* @date 4/06/2014
-* @since 5.0.0
+* @type function
+* @date 4/06/2014
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_encode_choices( $array = array(), $show_keys = true ) {
-
+
// bail early if not array (maybe a single string)
- if( !is_array($array) ) return $array;
-
-
+ if ( ! is_array( $array ) ) {
+ return $array;
+ }
+
// bail early if empty array
- if( empty($array) ) return '';
-
-
+ if ( empty( $array ) ) {
+ return '';
+ }
+
// vars
$string = '';
-
-
+
// if allowed to show keys (good for choices, not for default values)
- if( $show_keys ) {
-
+ if ( $show_keys ) {
+
// loop
- foreach( $array as $k => $v ) {
-
+ foreach ( $array as $k => $v ) {
+
// ignore if key and value are the same
- if( strval($k) == strval($v) ) continue;
-
-
+ if ( strval( $k ) == strval( $v ) ) {
+ continue;
+ }
+
// show key in the value
$array[ $k ] = $k . ' : ' . $v;
-
- }
-
- }
-
-
- // implode
- $string = implode("\n", $array);
-
+ }
+ }
+
+ // implode
+ $string = implode( "\n", $array );
+
// return
return $string;
-
+
}
function acf_decode_choices( $string = '', $array_keys = false ) {
-
+
// bail early if already array
- if( is_array($string) ) {
-
+ if ( is_array( $string ) ) {
+
return $string;
-
- // allow numeric values (same as string)
- } elseif( is_numeric($string) ) {
-
+
+ // allow numeric values (same as string)
+ } elseif ( is_numeric( $string ) ) {
+
// do nothing
-
- // bail early if not a string
- } elseif( !is_string($string) ) {
-
+
+ // bail early if not a string
+ } elseif ( ! is_string( $string ) ) {
+
return array();
-
- // bail early if is empty string
- } elseif( $string === '' ) {
-
+
+ // bail early if is empty string
+ } elseif ( $string === '' ) {
+
return array();
-
+
}
-
-
+
// vars
$array = array();
-
-
+
// explode
- $lines = explode("\n", $string);
-
-
+ $lines = explode( "\n", $string );
+
// key => value
- foreach( $lines as $line ) {
-
+ foreach ( $lines as $line ) {
+
// vars
- $k = trim($line);
- $v = trim($line);
-
-
+ $k = trim( $line );
+ $v = trim( $line );
+
// look for ' : '
- if( acf_str_exists(' : ', $line) ) {
-
- $line = explode(' : ', $line);
-
- $k = trim($line[0]);
- $v = trim($line[1]);
-
+ if ( acf_str_exists( ' : ', $line ) ) {
+
+ $line = explode( ' : ', $line );
+
+ $k = trim( $line[0] );
+ $v = trim( $line[1] );
+
}
-
-
+
// append
$array[ $k ] = $v;
-
+
}
-
-
+
// return only array keys? (good for checkbox default_value)
- if( $array_keys ) {
-
- return array_keys($array);
-
+ if ( $array_keys ) {
+
+ return array_keys( $array );
+
}
-
-
+
// return
return $array;
-
+
}
@@ -2200,48 +2107,46 @@ function acf_decode_choices( $string = '', $array_keys = false ) {
* The difference is the extra logic to avoid replacing a string that has alread been replaced
* This is very useful for replacing date characters as they overlap with eachother
*
-* @type function
-* @date 21/06/2016
-* @since 5.3.8
+* @type function
+* @date 21/06/2016
+* @since 5.3.8
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_str_replace( $string = '', $search_replace = array() ) {
-
+
// vars
$ignore = array();
-
-
+
// remove potential empty search to avoid PHP error
- unset($search_replace['']);
-
-
+ unset( $search_replace[''] );
+
// loop over conversions
- foreach( $search_replace as $search => $replace ) {
-
+ foreach ( $search_replace as $search => $replace ) {
+
// ignore this search, it was a previous replace
- if( in_array($search, $ignore) ) continue;
-
-
+ if ( in_array( $search, $ignore ) ) {
+ continue;
+ }
+
// bail early if subsctring not found
- if( strpos($string, $search) === false ) continue;
-
-
+ if ( strpos( $string, $search ) === false ) {
+ continue;
+ }
+
// replace
- $string = str_replace($search, $replace, $string);
-
-
+ $string = str_replace( $search, $replace, $string );
+
// append to ignore
$ignore[] = $replace;
-
+
}
-
-
+
// return
return $string;
-
+
}
@@ -2250,52 +2155,58 @@ function acf_str_replace( $string = '', $search_replace = array() ) {
*
* These settings contain an association of format strings from PHP => JS
*
-* @type function
-* @date 21/06/2016
-* @since 5.3.8
+* @type function
+* @date 21/06/2016
+* @since 5.3.8
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
-acf_update_setting('php_to_js_date_formats', array(
+acf_update_setting(
+ 'php_to_js_date_formats',
+ array(
+
+ // Year
+ 'Y' => 'yy', // Numeric, 4 digits 1999, 2003
+ 'y' => 'y', // Numeric, 2 digits 99, 03
+
- // Year
- 'Y' => 'yy', // Numeric, 4 digits 1999, 2003
- 'y' => 'y', // Numeric, 2 digits 99, 03
-
-
// Month
- 'm' => 'mm', // Numeric, with leading zeros 01–12
- 'n' => 'm', // Numeric, without leading zeros 1–12
- 'F' => 'MM', // Textual full January – December
- 'M' => 'M', // Textual three letters Jan - Dec
-
-
- // Weekday
- 'l' => 'DD', // Full name (lowercase 'L') Sunday – Saturday
- 'D' => 'D', // Three letter name Mon – Sun
-
-
- // Day of Month
- 'd' => 'dd', // Numeric, with leading zeros 01–31
- 'j' => 'd', // Numeric, without leading zeros 1–31
- 'S' => '', // The English suffix for the day of the month st, nd or th in the 1st, 2nd or 15th.
-
-));
+ 'm' => 'mm', // Numeric, with leading zeros 01–12
+ 'n' => 'm', // Numeric, without leading zeros 1–12
+ 'F' => 'MM', // Textual full January – December
+ 'M' => 'M', // Textual three letters Jan - Dec
-acf_update_setting('php_to_js_time_formats', array(
-
- 'a' => 'tt', // Lowercase Ante meridiem and Post meridiem am or pm
- 'A' => 'TT', // Uppercase Ante meridiem and Post meridiem AM or PM
- 'h' => 'hh', // 12-hour format of an hour with leading zeros 01 through 12
- 'g' => 'h', // 12-hour format of an hour without leading zeros 1 through 12
- 'H' => 'HH', // 24-hour format of an hour with leading zeros 00 through 23
- 'G' => 'H', // 24-hour format of an hour without leading zeros 0 through 23
- 'i' => 'mm', // Minutes with leading zeros 00 to 59
- 's' => 'ss', // Seconds, with leading zeros 00 through 59
-
-));
+
+ // Weekday
+ 'l' => 'DD', // Full name (lowercase 'L') Sunday – Saturday
+ 'D' => 'D', // Three letter name Mon – Sun
+
+
+ // Day of Month
+ 'd' => 'dd', // Numeric, with leading zeros 01–31
+ 'j' => 'd', // Numeric, without leading zeros 1–31
+ 'S' => '', // The English suffix for the day of the month st, nd or th in the 1st, 2nd or 15th.
+
+ )
+);
+
+acf_update_setting(
+ 'php_to_js_time_formats',
+ array(
+
+ 'a' => 'tt', // Lowercase Ante meridiem and Post meridiem am or pm
+ 'A' => 'TT', // Uppercase Ante meridiem and Post meridiem AM or PM
+ 'h' => 'hh', // 12-hour format of an hour with leading zeros 01 through 12
+ 'g' => 'h', // 12-hour format of an hour without leading zeros 1 through 12
+ 'H' => 'HH', // 24-hour format of an hour with leading zeros 00 through 23
+ 'G' => 'H', // 24-hour format of an hour without leading zeros 0 through 23
+ 'i' => 'mm', // Minutes with leading zeros 00 to 59
+ 's' => 'ss', // Seconds, with leading zeros 00 through 59
+
+ )
+);
/*
@@ -2303,60 +2214,55 @@ acf_update_setting('php_to_js_time_formats', array(
*
* This function will split a format string into seperate date and time
*
-* @type function
-* @date 26/05/2016
-* @since 5.3.8
+* @type function
+* @date 26/05/2016
+* @since 5.3.8
*
-* @param $date_time (string)
-* @return $formats (array)
+* @param $date_time (string)
+* @return $formats (array)
*/
function acf_split_date_time( $date_time = '' ) {
-
+
// vars
- $php_date = acf_get_setting('php_to_js_date_formats');
- $php_time = acf_get_setting('php_to_js_time_formats');
- $chars = str_split($date_time);
- $type = 'date';
-
-
+ $php_date = acf_get_setting( 'php_to_js_date_formats' );
+ $php_time = acf_get_setting( 'php_to_js_time_formats' );
+ $chars = str_split( $date_time );
+ $type = 'date';
+
// default
$data = array(
'date' => '',
- 'time' => ''
+ 'time' => '',
);
-
-
+
// loop
- foreach( $chars as $i => $c ) {
-
+ foreach ( $chars as $i => $c ) {
+
// find type
// - allow misc characters to append to previous type
- if( isset($php_date[ $c ]) ) {
-
+ if ( isset( $php_date[ $c ] ) ) {
+
$type = 'date';
-
- } elseif( isset($php_time[ $c ]) ) {
-
+
+ } elseif ( isset( $php_time[ $c ] ) ) {
+
$type = 'time';
-
+
}
-
-
+
// append char
$data[ $type ] .= $c;
-
+
}
-
-
+
// trim
- $data['date'] = trim($data['date']);
- $data['time'] = trim($data['time']);
-
-
+ $data['date'] = trim( $data['date'] );
+ $data['time'] = trim( $data['time'] );
+
// return
- return $data;
-
+ return $data;
+
}
@@ -2365,24 +2271,23 @@ function acf_split_date_time( $date_time = '' ) {
*
* This fucntion converts a date format string from JS to PHP
*
-* @type function
-* @date 20/06/2014
-* @since 5.0.0
+* @type function
+* @date 20/06/2014
+* @since 5.0.0
*
-* @param $date (string)
-* @return (string)
+* @param $date (string)
+* @return (string)
*/
function acf_convert_date_to_php( $date = '' ) {
-
+
// vars
- $php_to_js = acf_get_setting('php_to_js_date_formats');
- $js_to_php = array_flip($php_to_js);
-
-
+ $php_to_js = acf_get_setting( 'php_to_js_date_formats' );
+ $js_to_php = array_flip( $php_to_js );
+
// return
return acf_str_replace( $date, $js_to_php );
-
+
}
/*
@@ -2390,23 +2295,22 @@ function acf_convert_date_to_php( $date = '' ) {
*
* This fucntion converts a date format string from PHP to JS
*
-* @type function
-* @date 20/06/2014
-* @since 5.0.0
+* @type function
+* @date 20/06/2014
+* @since 5.0.0
*
-* @param $date (string)
-* @return (string)
+* @param $date (string)
+* @return (string)
*/
function acf_convert_date_to_js( $date = '' ) {
-
+
// vars
- $php_to_js = acf_get_setting('php_to_js_date_formats');
-
-
+ $php_to_js = acf_get_setting( 'php_to_js_date_formats' );
+
// return
return acf_str_replace( $date, $php_to_js );
-
+
}
@@ -2415,24 +2319,23 @@ function acf_convert_date_to_js( $date = '' ) {
*
* This fucntion converts a time format string from JS to PHP
*
-* @type function
-* @date 20/06/2014
-* @since 5.0.0
+* @type function
+* @date 20/06/2014
+* @since 5.0.0
*
-* @param $time (string)
-* @return (string)
+* @param $time (string)
+* @return (string)
*/
function acf_convert_time_to_php( $time = '' ) {
-
+
// vars
- $php_to_js = acf_get_setting('php_to_js_time_formats');
- $js_to_php = array_flip($php_to_js);
-
-
+ $php_to_js = acf_get_setting( 'php_to_js_time_formats' );
+ $js_to_php = array_flip( $php_to_js );
+
// return
return acf_str_replace( $time, $js_to_php );
-
+
}
@@ -2441,23 +2344,22 @@ function acf_convert_time_to_php( $time = '' ) {
*
* This fucntion converts a date format string from PHP to JS
*
-* @type function
-* @date 20/06/2014
-* @since 5.0.0
+* @type function
+* @date 20/06/2014
+* @since 5.0.0
*
-* @param $time (string)
-* @return (string)
+* @param $time (string)
+* @return (string)
*/
function acf_convert_time_to_js( $time = '' ) {
-
+
// vars
- $php_to_js = acf_get_setting('php_to_js_time_formats');
-
-
+ $php_to_js = acf_get_setting( 'php_to_js_time_formats' );
+
// return
return acf_str_replace( $time, $php_to_js );
-
+
}
@@ -2466,44 +2368,40 @@ function acf_convert_time_to_js( $time = '' ) {
*
* description
*
-* @type function
-* @date 15/07/2014
-* @since 5.0.0
+* @type function
+* @date 15/07/2014
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_update_user_setting( $name, $value ) {
-
+
// get current user id
$user_id = get_current_user_id();
-
-
+
// get user settings
$settings = get_user_meta( $user_id, 'acf_user_settings', true );
-
-
+
// ensure array
- $settings = acf_get_array($settings);
-
-
+ $settings = acf_get_array( $settings );
+
// delete setting (allow 0 to save)
- if( acf_is_empty($value) ) {
-
- unset($settings[ $name ]);
-
- // append setting
+ if ( acf_is_empty( $value ) ) {
+
+ unset( $settings[ $name ] );
+
+ // append setting
} else {
-
+
$settings[ $name ] = $value;
-
+
}
-
-
+
// update user data
- return update_metadata('user', $user_id, 'acf_user_settings', $settings);
-
+ return update_metadata( 'user', $user_id, 'acf_user_settings', $settings );
+
}
@@ -2512,35 +2410,33 @@ function acf_update_user_setting( $name, $value ) {
*
* description
*
-* @type function
-* @date 15/07/2014
-* @since 5.0.0
+* @type function
+* @date 15/07/2014
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_get_user_setting( $name = '', $default = false ) {
-
+
// get current user id
$user_id = get_current_user_id();
-
-
+
// get user settings
$settings = get_user_meta( $user_id, 'acf_user_settings', true );
-
-
+
// ensure array
- $settings = acf_get_array($settings);
-
-
+ $settings = acf_get_array( $settings );
+
// bail arly if no settings
- if( !isset($settings[$name]) ) return $default;
-
-
+ if ( ! isset( $settings[ $name ] ) ) {
+ return $default;
+ }
+
// return
- return $settings[$name];
-
+ return $settings[ $name ];
+
}
@@ -2549,23 +2445,24 @@ function acf_get_user_setting( $name = '', $default = false ) {
*
* description
*
-* @type function
-* @date 22/07/2014
-* @since 5.0.0
+* @type function
+* @date 22/07/2014
+* @since 5.0.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_in_array( $value = '', $array = false ) {
-
+
// bail early if not array
- if( !is_array($array) ) return false;
-
-
+ if ( ! is_array( $array ) ) {
+ return false;
+ }
+
// find value in array
- return in_array($value, $array);
-
+ return in_array( $value, $array );
+
}
@@ -2574,108 +2471,97 @@ function acf_in_array( $value = '', $array = false ) {
*
* This function will return a valid post_id based on the current screen / parameter
*
-* @type function
-* @date 8/12/2013
-* @since 5.0.0
+* @type function
+* @date 8/12/2013
+* @since 5.0.0
*
-* @param $post_id (mixed)
-* @return $post_id (mixed)
+* @param $post_id (mixed)
+* @return $post_id (mixed)
*/
function acf_get_valid_post_id( $post_id = 0 ) {
-
+
// allow filter to short-circuit load_value logic
- $preload = apply_filters( "acf/pre_load_post_id", null, $post_id );
- if( $preload !== null ) {
- return $preload;
- }
-
+ $preload = apply_filters( 'acf/pre_load_post_id', null, $post_id );
+ if ( $preload !== null ) {
+ return $preload;
+ }
+
// vars
$_post_id = $post_id;
-
-
+
// if not $post_id, load queried object
- if( !$post_id ) {
-
+ if ( ! $post_id ) {
+
// try for global post (needed for setup_postdata)
$post_id = (int) get_the_ID();
-
-
+
// try for current screen
- if( !$post_id ) {
-
+ if ( ! $post_id ) {
+
$post_id = get_queried_object();
-
+
}
-
}
-
-
+
// $post_id may be an object.
// todo: Compare class types instead.
- if( is_object($post_id) ) {
-
+ if ( is_object( $post_id ) ) {
+
// post
- if( isset($post_id->post_type, $post_id->ID) ) {
-
+ if ( isset( $post_id->post_type, $post_id->ID ) ) {
+
$post_id = $post_id->ID;
-
- // user
- } elseif( isset($post_id->roles, $post_id->ID) ) {
-
+
+ // user
+ } elseif ( isset( $post_id->roles, $post_id->ID ) ) {
+
$post_id = 'user_' . $post_id->ID;
-
- // term
- } elseif( isset($post_id->taxonomy, $post_id->term_id) ) {
-
+
+ // term
+ } elseif ( isset( $post_id->taxonomy, $post_id->term_id ) ) {
+
$post_id = 'term_' . $post_id->term_id;
-
- // comment
- } elseif( isset($post_id->comment_ID) ) {
-
+
+ // comment
+ } elseif ( isset( $post_id->comment_ID ) ) {
+
$post_id = 'comment_' . $post_id->comment_ID;
-
- // default
+
+ // default
} else {
-
+
$post_id = 0;
-
+
}
-
}
-
-
+
// allow for option == options
- if( $post_id === 'option' ) {
-
+ if ( $post_id === 'option' ) {
+
$post_id = 'options';
-
+
}
-
-
+
// append language code
- if( $post_id == 'options' ) {
-
- $dl = acf_get_setting('default_language');
- $cl = acf_get_setting('current_language');
-
- if( $cl && $cl !== $dl ) {
-
+ if ( $post_id == 'options' ) {
+
+ $dl = acf_get_setting( 'default_language' );
+ $cl = acf_get_setting( 'current_language' );
+
+ if ( $cl && $cl !== $dl ) {
+
$post_id .= '_' . $cl;
-
+
}
-
}
-
-
-
+
// filter for 3rd party
- $post_id = apply_filters('acf/validate_post_id', $post_id, $_post_id);
-
-
+ $post_id = apply_filters( 'acf/validate_post_id', $post_id, $_post_id );
+
// return
return $post_id;
-
+
}
@@ -2685,86 +2571,82 @@ function acf_get_valid_post_id( $post_id = 0 ) {
*
* This function will return the type and id for a given $post_id string
*
-* @type function
-* @date 2/07/2016
-* @since 5.4.0
+* @type function
+* @date 2/07/2016
+* @since 5.4.0
*
-* @param $post_id (mixed)
-* @return $info (array)
+* @param $post_id (mixed)
+* @return $info (array)
*/
function acf_get_post_id_info( $post_id = 0 ) {
-
+
// vars
$info = array(
- 'type' => 'post',
- 'id' => 0
+ 'type' => 'post',
+ 'id' => 0,
);
-
+
// bail early if no $post_id
- if( !$post_id ) return $info;
-
-
+ if ( ! $post_id ) {
+ return $info;
+ }
+
// check cache
// - this function will most likely be called multiple times (saving loading fields from post)
- //$cache_key = "get_post_id_info/post_id={$post_id}";
-
- //if( acf_isset_cache($cache_key) ) return acf_get_cache($cache_key);
-
-
+ // $cache_key = "get_post_id_info/post_id={$post_id}";
+
+ // if( acf_isset_cache($cache_key) ) return acf_get_cache($cache_key);
+
// numeric
- if( is_numeric($post_id) ) {
-
+ if ( is_numeric( $post_id ) ) {
+
$info['id'] = (int) $post_id;
-
- // string
- } elseif( is_string($post_id) ) {
-
+
+ // string
+ } elseif ( is_string( $post_id ) ) {
+
// vars
$glue = '_';
- $type = explode($glue, $post_id);
- $id = array_pop($type);
- $type = implode($glue, $type);
- $meta = array('post', 'user', 'comment', 'term');
-
-
+ $type = explode( $glue, $post_id );
+ $id = array_pop( $type );
+ $type = implode( $glue, $type );
+ $meta = array( 'post', 'user', 'comment', 'term' );
+
// check if is taxonomy (ACF < 5.5)
// - avoid scenario where taxonomy exists with name of meta type
- if( !in_array($type, $meta) && acf_isset_termmeta($type) ) $type = 'term';
-
-
- // meta
- if( is_numeric($id) && in_array($type, $meta) ) {
-
- $info['type'] = $type;
- $info['id'] = (int) $id;
-
- // option
- } else {
-
- $info['type'] = 'option';
- $info['id'] = $post_id;
-
+ if ( ! in_array( $type, $meta ) && acf_isset_termmeta( $type ) ) {
+ $type = 'term';
+ }
+
+ // meta
+ if ( is_numeric( $id ) && in_array( $type, $meta ) ) {
+
+ $info['type'] = $type;
+ $info['id'] = (int) $id;
+
+ // option
+ } else {
+
+ $info['type'] = 'option';
+ $info['id'] = $post_id;
+
}
-
}
-
-
+
// update cache
- //acf_set_cache($cache_key, $info);
-
-
+ // acf_set_cache($cache_key, $info);
+
// filter
- $info = apply_filters("acf/get_post_id_info", $info, $post_id);
-
+ $info = apply_filters( 'acf/get_post_id_info', $info, $post_id );
+
// return
return $info;
-
+
}
/*
-
acf_log( acf_get_post_id_info(4) );
acf_log( acf_get_post_id_info('post_4') );
@@ -2792,27 +2674,29 @@ acf_log( acf_get_post_id_info('options') );
* This function will return true if the termmeta table exists
* https://developer.wordpress.org/reference/functions/get_term_meta/
*
-* @type function
-* @date 3/09/2016
-* @since 5.4.0
+* @type function
+* @date 3/09/2016
+* @since 5.4.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_isset_termmeta( $taxonomy = '' ) {
-
+
// bail ealry if no table
- if( get_option('db_version') < 34370 ) return false;
-
-
+ if ( get_option( 'db_version' ) < 34370 ) {
+ return false;
+ }
+
// check taxonomy
- if( $taxonomy && !taxonomy_exists($taxonomy) ) return false;
-
-
+ if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
+ return false;
+ }
+
// return
return true;
-
+
}
@@ -2821,86 +2705,77 @@ function acf_isset_termmeta( $taxonomy = '' ) {
*
* This function will walk througfh the $_FILES data and upload each found
*
-* @type function
-* @date 25/10/2014
-* @since 5.0.9
+* @type function
+* @date 25/10/2014
+* @since 5.0.9
*
-* @param $ancestors (array) an internal parameter, not required
-* @return n/a
+* @param $ancestors (array) an internal parameter, not required
+* @return n/a
*/
-
+
function acf_upload_files( $ancestors = array() ) {
-
+
// vars
$file = array(
- 'name' => '',
- 'type' => '',
- 'tmp_name' => '',
- 'error' => '',
- 'size' => ''
+ 'name' => '',
+ 'type' => '',
+ 'tmp_name' => '',
+ 'error' => '',
+ 'size' => '',
);
-
-
+
// populate with $_FILES data
- foreach( array_keys($file) as $k ) {
-
+ foreach ( array_keys( $file ) as $k ) {
+
$file[ $k ] = $_FILES['acf'][ $k ];
-
+
}
-
-
+
// walk through ancestors
- if( !empty($ancestors) ) {
-
- foreach( $ancestors as $a ) {
-
- foreach( array_keys($file) as $k ) {
-
+ if ( ! empty( $ancestors ) ) {
+
+ foreach ( $ancestors as $a ) {
+
+ foreach ( array_keys( $file ) as $k ) {
+
$file[ $k ] = $file[ $k ][ $a ];
-
+
}
-
}
-
}
-
-
+
// is array?
- if( is_array($file['name']) ) {
-
- foreach( array_keys($file['name']) as $k ) {
-
- $_ancestors = array_merge($ancestors, array($k));
-
+ if ( is_array( $file['name'] ) ) {
+
+ foreach ( array_keys( $file['name'] ) as $k ) {
+
+ $_ancestors = array_merge( $ancestors, array( $k ) );
+
acf_upload_files( $_ancestors );
-
+
}
-
+
return;
-
+
}
-
-
+
// bail ealry if file has error (no file uploaded)
- if( $file['error'] ) {
-
+ if ( $file['error'] ) {
+
return;
-
+
}
-
-
+
// assign global _acfuploader for media validation
- $_POST['_acfuploader'] = end($ancestors);
-
-
+ $_POST['_acfuploader'] = end( $ancestors );
+
// file found!
$attachment_id = acf_upload_file( $file );
-
-
+
// update $_POST
- array_unshift($ancestors, 'acf');
+ array_unshift( $ancestors, 'acf' );
acf_update_nested_array( $_POST, $ancestors, $attachment_id );
-
+
}
@@ -2909,65 +2784,60 @@ function acf_upload_files( $ancestors = array() ) {
*
* This function will uploade a $_FILE
*
-* @type function
-* @date 27/10/2014
-* @since 5.0.9
+* @type function
+* @date 27/10/2014
+* @since 5.0.9
*
-* @param $uploaded_file (array) array found from $_FILE data
-* @return $id (int) new attachment ID
+* @param $uploaded_file (array) array found from $_FILE data
+* @return $id (int) new attachment ID
*/
function acf_upload_file( $uploaded_file ) {
-
+
// required
- //require_once( ABSPATH . "/wp-load.php" ); // WP should already be loaded
- require_once( ABSPATH . "/wp-admin/includes/media.php" ); // video functions
- require_once( ABSPATH . "/wp-admin/includes/file.php" );
- require_once( ABSPATH . "/wp-admin/includes/image.php" );
-
-
+ // require_once( ABSPATH . "/wp-load.php" ); // WP should already be loaded
+ require_once ABSPATH . '/wp-admin/includes/media.php'; // video functions
+ require_once ABSPATH . '/wp-admin/includes/file.php';
+ require_once ABSPATH . '/wp-admin/includes/image.php';
+
// required for wp_handle_upload() to upload the file
$upload_overrides = array( 'test_form' => false );
-
-
+
// upload
$file = wp_handle_upload( $uploaded_file, $upload_overrides );
-
-
+
// bail ealry if upload failed
- if( isset($file['error']) ) {
-
+ if ( isset( $file['error'] ) ) {
+
return $file['error'];
-
+
}
-
-
+
// vars
- $url = $file['url'];
- $type = $file['type'];
- $file = $file['file'];
- $filename = basename($file);
-
+ $url = $file['url'];
+ $type = $file['type'];
+ $file = $file['file'];
+ $filename = basename( $file );
// Construct the object array
$object = array(
- 'post_title' => $filename,
+ 'post_title' => $filename,
'post_mime_type' => $type,
- 'guid' => $url
+ 'guid' => $url,
);
// Save the data
- $id = wp_insert_attachment($object, $file);
+ $id = wp_insert_attachment( $object, $file );
// Add the meta-data
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
+
/** This action is documented in wp-admin/custom-header.php */
do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
-
+
// return new ID
return $id;
-
+
}
@@ -2976,42 +2846,39 @@ function acf_upload_file( $uploaded_file ) {
*
* This function will update a nested array value. Useful for modifying the $_POST array
*
-* @type function
-* @date 27/10/2014
-* @since 5.0.9
+* @type function
+* @date 27/10/2014
+* @since 5.0.9
*
-* @param $array (array) target array to be updated
-* @param $ancestors (array) array of keys to navigate through to find the child
-* @param $value (mixed) The new value
-* @return (boolean)
+* @param $array (array) target array to be updated
+* @param $ancestors (array) array of keys to navigate through to find the child
+* @param $value (mixed) The new value
+* @return (boolean)
*/
function acf_update_nested_array( &$array, $ancestors, $value ) {
-
+
// if no more ancestors, update the current var
- if( empty($ancestors) ) {
-
+ if ( empty( $ancestors ) ) {
+
$array = $value;
-
+
// return
return true;
-
+
}
-
-
+
// shift the next ancestor from the array
$k = array_shift( $ancestors );
-
-
+
// if exists
- if( isset($array[ $k ]) ) {
-
+ if ( isset( $array[ $k ] ) ) {
+
return acf_update_nested_array( $array[ $k ], $ancestors, $value );
-
+
}
-
-
- // return
+
+ // return
return false;
}
@@ -3021,35 +2888,35 @@ function acf_update_nested_array( &$array, $ancestors, $value ) {
*
* This function will return true if all args are matched for the current screen
*
-* @type function
-* @date 9/12/2014
-* @since 5.1.5
+* @type function
+* @date 9/12/2014
+* @since 5.1.5
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_is_screen( $id = '' ) {
-
+
// bail early if not defined
- if( !function_exists('get_current_screen') ) {
+ if ( ! function_exists( 'get_current_screen' ) ) {
return false;
}
-
+
// vars
$current_screen = get_current_screen();
-
+
// no screen
- if( !$current_screen ) {
+ if ( ! $current_screen ) {
return false;
-
- // array
- } elseif( is_array($id) ) {
- return in_array($current_screen->id, $id);
-
- // string
+
+ // array
+ } elseif ( is_array( $id ) ) {
+ return in_array( $current_screen->id, $id );
+
+ // string
} else {
- return ($id === $current_screen->id);
+ return ( $id === $current_screen->id );
}
}
@@ -3059,65 +2926,65 @@ function acf_is_screen( $id = '' ) {
*
* This function will return a var if it exists in an array
*
-* @type function
-* @date 9/12/2014
-* @since 5.1.5
+* @type function
+* @date 9/12/2014
+* @since 5.1.5
*
-* @param $array (array) the array to look within
-* @param $key (key) the array key to look for. Nested values may be found using '/'
-* @param $default (mixed) the value returned if not found
-* @return $post_id (int)
+* @param $array (array) the array to look within
+* @param $key (key) the array key to look for. Nested values may be found using '/'
+* @param $default (mixed) the value returned if not found
+* @return $post_id (int)
*/
function acf_maybe_get( $array = array(), $key = 0, $default = null ) {
-
- return isset( $array[$key] ) ? $array[$key] : $default;
-
+
+ return isset( $array[ $key ] ) ? $array[ $key ] : $default;
+
}
function acf_maybe_get_POST( $key = '', $default = null ) {
-
- return isset( $_POST[$key] ) ? $_POST[$key] : $default;
-
+
+ return isset( $_POST[ $key ] ) ? $_POST[ $key ] : $default;
+
}
function acf_maybe_get_GET( $key = '', $default = null ) {
-
- return isset( $_GET[$key] ) ? $_GET[$key] : $default;
-
+
+ return isset( $_GET[ $key ] ) ? $_GET[ $key ] : $default;
+
}
/**
* Returns an array of attachment data.
*
- * @date 05/01/2015
- * @since 5.1.5
+ * @date 05/01/2015
+ * @since 5.1.5
*
- * @param int|WP_Post The attachment ID or object.
- * @return array|false
+ * @param int|WP_Post The attachment ID or object.
+ * @return array|false
*/
function acf_get_attachment( $attachment ) {
-
+
// Allow filter to short-circuit load attachment logic.
- // Alternatively, this filter may be used to switch blogs for multisite media functionality.
- $response = apply_filters( "acf/pre_load_attachment", null, $attachment );
- if( $response !== null ) {
+ // Alternatively, this filter may be used to switch blogs for multisite media functionality.
+ $response = apply_filters( 'acf/pre_load_attachment', null, $attachment );
+ if ( $response !== null ) {
return $response;
}
// Get the attachment post object.
$attachment = get_post( $attachment );
- if( !$attachment ) {
+ if ( ! $attachment ) {
return false;
}
- if( $attachment->post_type !== 'attachment' ) {
+ if ( $attachment->post_type !== 'attachment' ) {
return false;
}
-
+
// Load various attachment details.
- $meta = wp_get_attachment_metadata( $attachment->ID );
+ $meta = wp_get_attachment_metadata( $attachment->ID );
$attached_file = get_attached_file( $attachment->ID );
- if( strpos( $attachment->post_mime_type, '/' ) !== false ) {
+ if ( strpos( $attachment->post_mime_type, '/' ) !== false ) {
list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
} else {
list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
@@ -3125,90 +2992,90 @@ function acf_get_attachment( $attachment ) {
// Generate response.
$response = array(
- 'ID' => $attachment->ID,
- 'id' => $attachment->ID,
- 'title' => $attachment->post_title,
- 'filename' => wp_basename( $attached_file ),
- 'filesize' => 0,
- 'url' => wp_get_attachment_url( $attachment->ID ),
- 'link' => get_attachment_link( $attachment->ID ),
- 'alt' => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
- 'author' => $attachment->post_author,
- 'description' => $attachment->post_content,
- 'caption' => $attachment->post_excerpt,
- 'name' => $attachment->post_name,
- 'status' => $attachment->post_status,
- 'uploaded_to' => $attachment->post_parent,
- 'date' => $attachment->post_date_gmt,
- 'modified' => $attachment->post_modified_gmt,
- 'menu_order' => $attachment->menu_order,
- 'mime_type' => $attachment->post_mime_type,
- 'type' => $type,
- 'subtype' => $subtype,
- 'icon' => wp_mime_type_icon( $attachment->ID )
+ 'ID' => $attachment->ID,
+ 'id' => $attachment->ID,
+ 'title' => $attachment->post_title,
+ 'filename' => wp_basename( $attached_file ),
+ 'filesize' => 0,
+ 'url' => wp_get_attachment_url( $attachment->ID ),
+ 'link' => get_attachment_link( $attachment->ID ),
+ 'alt' => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
+ 'author' => $attachment->post_author,
+ 'description' => $attachment->post_content,
+ 'caption' => $attachment->post_excerpt,
+ 'name' => $attachment->post_name,
+ 'status' => $attachment->post_status,
+ 'uploaded_to' => $attachment->post_parent,
+ 'date' => $attachment->post_date_gmt,
+ 'modified' => $attachment->post_modified_gmt,
+ 'menu_order' => $attachment->menu_order,
+ 'mime_type' => $attachment->post_mime_type,
+ 'type' => $type,
+ 'subtype' => $subtype,
+ 'icon' => wp_mime_type_icon( $attachment->ID ),
);
-
+
// Append filesize data.
- if( isset($meta['filesize']) ) {
+ if ( isset( $meta['filesize'] ) ) {
$response['filesize'] = $meta['filesize'];
- } elseif( file_exists($attached_file) ) {
+ } elseif ( file_exists( $attached_file ) ) {
$response['filesize'] = filesize( $attached_file );
}
-
+
// Restrict the loading of image "sizes".
$sizes_id = 0;
// Type specific logic.
- switch( $type ) {
+ switch ( $type ) {
case 'image':
$sizes_id = $attachment->ID;
- $src = wp_get_attachment_image_src( $attachment->ID, 'full' );
+ $src = wp_get_attachment_image_src( $attachment->ID, 'full' );
if ( $src ) {
- $response['url'] = $src[0];
- $response['width'] = $src[1];
+ $response['url'] = $src[0];
+ $response['width'] = $src[1];
$response['height'] = $src[2];
}
break;
case 'video':
- $response['width'] = acf_maybe_get( $meta, 'width', 0 );
+ $response['width'] = acf_maybe_get( $meta, 'width', 0 );
$response['height'] = acf_maybe_get( $meta, 'height', 0 );
- if( $featured_id = get_post_thumbnail_id( $attachment->ID ) ) {
+ if ( $featured_id = get_post_thumbnail_id( $attachment->ID ) ) {
$sizes_id = $featured_id;
}
break;
case 'audio':
- if( $featured_id = get_post_thumbnail_id( $attachment->ID ) ) {
+ if ( $featured_id = get_post_thumbnail_id( $attachment->ID ) ) {
$sizes_id = $featured_id;
- }
+ }
break;
}
// Load array of image sizes.
- if( $sizes_id ) {
- $sizes = get_intermediate_image_sizes();
+ if ( $sizes_id ) {
+ $sizes = get_intermediate_image_sizes();
$sizes_data = array();
- foreach( $sizes as $size ) {
+ foreach ( $sizes as $size ) {
$src = wp_get_attachment_image_src( $sizes_id, $size );
if ( $src ) {
- $sizes_data[ $size ] = $src[0];
- $sizes_data[ $size . '-width' ] = $src[1];
+ $sizes_data[ $size ] = $src[0];
+ $sizes_data[ $size . '-width' ] = $src[1];
$sizes_data[ $size . '-height' ] = $src[2];
}
}
$response['sizes'] = $sizes_data;
}
-
+
/**
* Filters the attachment $response after it has been loaded.
*
- * @date 16/06/2020
- * @since 5.9.0
+ * @date 16/06/2020
+ * @since 5.9.0
*
- * @param array $response Array of loaded attachment data.
- * @param WP_Post $attachment Attachment object.
- * @param array|false $meta Array of attachment meta data, or false if there is none.
+ * @param array $response Array of loaded attachment data.
+ * @param WP_Post $attachment Attachment object.
+ * @param array|false $meta Array of attachment meta data, or false if there is none.
*/
- return apply_filters( "acf/load_attachment", $response, $attachment, $meta );
+ return apply_filters( 'acf/load_attachment', $response, $attachment, $meta );
}
@@ -3217,37 +3084,34 @@ function acf_get_attachment( $attachment ) {
*
* This function will truncate and return a string
*
-* @type function
-* @date 8/08/2014
-* @since 5.0.0
+* @type function
+* @date 8/08/2014
+* @since 5.0.0
*
-* @param $text (string)
-* @param $length (int)
-* @return (string)
+* @param $text (string)
+* @param $length (int)
+* @return (string)
*/
function acf_get_truncated( $text, $length = 64 ) {
-
+
// vars
- $text = trim($text);
+ $text = trim( $text );
$the_length = strlen( $text );
-
-
+
// cut
- $return = substr( $text, 0, ($length - 3) );
-
-
+ $return = substr( $text, 0, ( $length - 3 ) );
+
// ...
- if( $the_length > ($length - 3) ) {
-
+ if ( $the_length > ( $length - 3 ) ) {
+
$return .= '...';
-
+
}
-
-
+
// return
return $return;
-
+
}
/*
@@ -3255,26 +3119,25 @@ function acf_get_truncated( $text, $length = 64 ) {
*
* This function will return true if the current user can administrate the ACF field groups
*
-* @type function
-* @date 9/02/2015
-* @since 5.1.5
+* @type function
+* @date 9/02/2015
+* @since 5.1.5
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_current_user_can_admin() {
-
- if( acf_get_setting('show_admin') && current_user_can(acf_get_setting('capability')) ) {
-
+
+ if ( acf_get_setting( 'show_admin' ) && current_user_can( acf_get_setting( 'capability' ) ) ) {
+
return true;
-
+
}
-
-
+
// return
return false;
-
+
}
@@ -3283,53 +3146,48 @@ function acf_current_user_can_admin() {
*
* This function will return a numeric value of bytes for a given filesize string
*
-* @type function
-* @date 18/02/2015
-* @since 5.1.5
+* @type function
+* @date 18/02/2015
+* @since 5.1.5
*
-* @param $size (mixed)
-* @return (int)
+* @param $size (mixed)
+* @return (int)
*/
function acf_get_filesize( $size = 1 ) {
-
+
// vars
- $unit = 'MB';
+ $unit = 'MB';
$units = array(
'TB' => 4,
'GB' => 3,
'MB' => 2,
'KB' => 1,
);
-
-
+
// look for $unit within the $size parameter (123 KB)
- if( is_string($size) ) {
-
+ if ( is_string( $size ) ) {
+
// vars
- $custom = strtoupper( substr($size, -2) );
-
- foreach( $units as $k => $v ) {
-
- if( $custom === $k ) {
-
+ $custom = strtoupper( substr( $size, -2 ) );
+
+ foreach ( $units as $k => $v ) {
+
+ if ( $custom === $k ) {
+
$unit = $k;
- $size = substr($size, 0, -2);
-
+ $size = substr( $size, 0, -2 );
+
}
-
}
-
}
-
-
+
// calc bytes
- $bytes = floatval($size) * pow(1024, $units[$unit]);
-
-
+ $bytes = floatval( $size ) * pow( 1024, $units[ $unit ] );
+
// return
return $bytes;
-
+
}
@@ -3338,20 +3196,19 @@ function acf_get_filesize( $size = 1 ) {
*
* This function will return a formatted string containing the filesize and unit
*
-* @type function
-* @date 18/02/2015
-* @since 5.1.5
+* @type function
+* @date 18/02/2015
+* @since 5.1.5
*
-* @param $size (mixed)
-* @return (int)
+* @param $size (mixed)
+* @return (int)
*/
function acf_format_filesize( $size = 1 ) {
-
+
// convert
$bytes = acf_get_filesize( $size );
-
-
+
// vars
$units = array(
'TB' => 4,
@@ -3359,25 +3216,22 @@ function acf_format_filesize( $size = 1 ) {
'MB' => 2,
'KB' => 1,
);
-
-
+
// loop through units
- foreach( $units as $k => $v ) {
-
- $result = $bytes / pow(1024, $v);
-
- if( $result >= 1 ) {
-
+ foreach ( $units as $k => $v ) {
+
+ $result = $bytes / pow( 1024, $v );
+
+ if ( $result >= 1 ) {
+
return $result . ' ' . $k;
-
+
}
-
}
-
-
+
// return
return $bytes . ' B';
-
+
}
@@ -3386,50 +3240,45 @@ function acf_format_filesize( $size = 1 ) {
*
* This function will replace old terms with new split term ids
*
-* @type function
-* @date 27/02/2015
-* @since 5.1.5
+* @type function
+* @date 27/02/2015
+* @since 5.1.5
*
-* @param $terms (int|array)
-* @param $taxonomy (string)
-* @return $terms
+* @param $terms (int|array)
+* @param $taxonomy (string)
+* @return $terms
*/
function acf_get_valid_terms( $terms = false, $taxonomy = 'category' ) {
-
+
// force into array
- $terms = acf_get_array($terms);
-
-
+ $terms = acf_get_array( $terms );
+
// force ints
- $terms = array_map('intval', $terms);
-
-
+ $terms = array_map( 'intval', $terms );
+
// bail early if function does not yet exist or
- if( !function_exists('wp_get_split_term') || empty($terms) ) {
-
+ if ( ! function_exists( 'wp_get_split_term' ) || empty( $terms ) ) {
+
return $terms;
-
+
}
-
-
+
// attempt to find new terms
- foreach( $terms as $i => $term_id ) {
-
- $new_term_id = wp_get_split_term($term_id, $taxonomy);
-
- if( $new_term_id ) {
-
+ foreach ( $terms as $i => $term_id ) {
+
+ $new_term_id = wp_get_split_term( $term_id, $taxonomy );
+
+ if ( $new_term_id ) {
+
$terms[ $i ] = $new_term_id;
-
+
}
-
}
-
-
+
// return
return $terms;
-
+
}
@@ -3438,185 +3287,172 @@ function acf_get_valid_terms( $terms = false, $taxonomy = 'category' ) {
*
* This function will validate an attachment based on a field's restrictions and return an array of errors
*
-* @type function
-* @date 3/07/2015
-* @since 5.2.3
+* @type function
+* @date 3/07/2015
+* @since 5.2.3
*
-* @param $attachment (array) attachment data. Changes based on context
-* @param $field (array) field settings containing restrictions
-* @param $context (string) $file is different when uploading / preparing
-* @return $errors (array)
+* @param $attachment (array) attachment data. Changes based on context
+* @param $field (array) field settings containing restrictions
+* @param $context (string) $file is different when uploading / preparing
+* @return $errors (array)
*/
function acf_validate_attachment( $attachment, $field, $context = 'prepare' ) {
-
+
// vars
$errors = array();
- $file = array(
- 'type' => '',
- 'width' => 0,
- 'height' => 0,
- 'size' => 0
+ $file = array(
+ 'type' => '',
+ 'width' => 0,
+ 'height' => 0,
+ 'size' => 0,
);
-
-
+
// upload
- if( $context == 'upload' ) {
-
+ if ( $context == 'upload' ) {
+
// vars
- $file['type'] = pathinfo($attachment['name'], PATHINFO_EXTENSION);
- $file['size'] = filesize($attachment['tmp_name']);
-
- if( strpos($attachment['type'], 'image') !== false ) {
-
- $size = getimagesize($attachment['tmp_name']);
- $file['width'] = acf_maybe_get($size, 0);
- $file['height'] = acf_maybe_get($size, 1);
-
+ $file['type'] = pathinfo( $attachment['name'], PATHINFO_EXTENSION );
+ $file['size'] = filesize( $attachment['tmp_name'] );
+
+ if ( strpos( $attachment['type'], 'image' ) !== false ) {
+
+ $size = getimagesize( $attachment['tmp_name'] );
+ $file['width'] = acf_maybe_get( $size, 0 );
+ $file['height'] = acf_maybe_get( $size, 1 );
+
}
-
- // prepare
- } elseif( $context == 'prepare' ) {
-
- $use_path = isset($attachment['filename']) ? $attachment['filename'] : $attachment['url'];
- $file['type'] = pathinfo($use_path, PATHINFO_EXTENSION);
- $file['size'] = acf_maybe_get($attachment, 'filesizeInBytes', 0);
- $file['width'] = acf_maybe_get($attachment, 'width', 0);
- $file['height'] = acf_maybe_get($attachment, 'height', 0);
-
- // custom
+
+ // prepare
+ } elseif ( $context == 'prepare' ) {
+
+ $use_path = isset( $attachment['filename'] ) ? $attachment['filename'] : $attachment['url'];
+ $file['type'] = pathinfo( $use_path, PATHINFO_EXTENSION );
+ $file['size'] = acf_maybe_get( $attachment, 'filesizeInBytes', 0 );
+ $file['width'] = acf_maybe_get( $attachment, 'width', 0 );
+ $file['height'] = acf_maybe_get( $attachment, 'height', 0 );
+
+ // custom
} else {
-
- $file = array_merge($file, $attachment);
- $use_path = isset($attachment['filename']) ? $attachment['filename'] : $attachment['url'];
- $file['type'] = pathinfo($use_path, PATHINFO_EXTENSION);
-
+
+ $file = array_merge( $file, $attachment );
+ $use_path = isset( $attachment['filename'] ) ? $attachment['filename'] : $attachment['url'];
+ $file['type'] = pathinfo( $use_path, PATHINFO_EXTENSION );
+
}
-
-
+
// image
- if( $file['width'] || $file['height'] ) {
-
+ if ( $file['width'] || $file['height'] ) {
+
// width
- $min_width = (int) acf_maybe_get($field, 'min_width', 0);
- $max_width = (int) acf_maybe_get($field, 'max_width', 0);
-
- if( $file['width'] ) {
-
- if( $min_width && $file['width'] < $min_width ) {
-
+ $min_width = (int) acf_maybe_get( $field, 'min_width', 0 );
+ $max_width = (int) acf_maybe_get( $field, 'max_width', 0 );
+
+ if ( $file['width'] ) {
+
+ if ( $min_width && $file['width'] < $min_width ) {
+
// min width
- $errors['min_width'] = sprintf(__('Image width must be at least %dpx.', 'acf'), $min_width );
-
- } elseif( $max_width && $file['width'] > $max_width ) {
-
+ $errors['min_width'] = sprintf( __( 'Image width must be at least %dpx.', 'acf' ), $min_width );
+
+ } elseif ( $max_width && $file['width'] > $max_width ) {
+
// min width
- $errors['max_width'] = sprintf(__('Image width must not exceed %dpx.', 'acf'), $max_width );
-
+ $errors['max_width'] = sprintf( __( 'Image width must not exceed %dpx.', 'acf' ), $max_width );
+
}
-
}
-
-
+
// height
- $min_height = (int) acf_maybe_get($field, 'min_height', 0);
- $max_height = (int) acf_maybe_get($field, 'max_height', 0);
-
- if( $file['height'] ) {
-
- if( $min_height && $file['height'] < $min_height ) {
-
+ $min_height = (int) acf_maybe_get( $field, 'min_height', 0 );
+ $max_height = (int) acf_maybe_get( $field, 'max_height', 0 );
+
+ if ( $file['height'] ) {
+
+ if ( $min_height && $file['height'] < $min_height ) {
+
// min height
- $errors['min_height'] = sprintf(__('Image height must be at least %dpx.', 'acf'), $min_height );
-
- } elseif( $max_height && $file['height'] > $max_height ) {
-
+ $errors['min_height'] = sprintf( __( 'Image height must be at least %dpx.', 'acf' ), $min_height );
+
+ } elseif ( $max_height && $file['height'] > $max_height ) {
+
// min height
- $errors['max_height'] = sprintf(__('Image height must not exceed %dpx.', 'acf'), $max_height );
-
+ $errors['max_height'] = sprintf( __( 'Image height must not exceed %dpx.', 'acf' ), $max_height );
+
}
-
}
-
}
-
-
+
// file size
- if( $file['size'] ) {
-
- $min_size = acf_maybe_get($field, 'min_size', 0);
- $max_size = acf_maybe_get($field, 'max_size', 0);
-
- if( $min_size && $file['size'] < acf_get_filesize($min_size) ) {
-
+ if ( $file['size'] ) {
+
+ $min_size = acf_maybe_get( $field, 'min_size', 0 );
+ $max_size = acf_maybe_get( $field, 'max_size', 0 );
+
+ if ( $min_size && $file['size'] < acf_get_filesize( $min_size ) ) {
+
// min width
- $errors['min_size'] = sprintf(__('File size must be at least %s.', 'acf'), acf_format_filesize($min_size) );
-
- } elseif( $max_size && $file['size'] > acf_get_filesize($max_size) ) {
-
+ $errors['min_size'] = sprintf( __( 'File size must be at least %s.', 'acf' ), acf_format_filesize( $min_size ) );
+
+ } elseif ( $max_size && $file['size'] > acf_get_filesize( $max_size ) ) {
+
// min width
- $errors['max_size'] = sprintf(__('File size must not exceed %s.', 'acf'), acf_format_filesize($max_size) );
-
+ $errors['max_size'] = sprintf( __( 'File size must not exceed %s.', 'acf' ), acf_format_filesize( $max_size ) );
+
}
-
}
-
-
+
// file type
- if( $file['type'] ) {
-
- $mime_types = acf_maybe_get($field, 'mime_types', '');
-
+ if ( $file['type'] ) {
+
+ $mime_types = acf_maybe_get( $field, 'mime_types', '' );
+
// lower case
- $file['type'] = strtolower($file['type']);
- $mime_types = strtolower($mime_types);
-
-
+ $file['type'] = strtolower( $file['type'] );
+ $mime_types = strtolower( $mime_types );
+
// explode
- $mime_types = str_replace(array(' ', '.'), '', $mime_types);
- $mime_types = explode(',', $mime_types); // split pieces
- $mime_types = array_filter($mime_types); // remove empty pieces
-
- if( !empty($mime_types) && !in_array($file['type'], $mime_types) ) {
-
+ $mime_types = str_replace( array( ' ', '.' ), '', $mime_types );
+ $mime_types = explode( ',', $mime_types ); // split pieces
+ $mime_types = array_filter( $mime_types ); // remove empty pieces
+
+ if ( ! empty( $mime_types ) && ! in_array( $file['type'], $mime_types ) ) {
+
// glue together last 2 types
- if( count($mime_types) > 1 ) {
-
- $last1 = array_pop($mime_types);
- $last2 = array_pop($mime_types);
-
- $mime_types[] = $last2 . ' ' . __('or', 'acf') . ' ' . $last1;
-
+ if ( count( $mime_types ) > 1 ) {
+
+ $last1 = array_pop( $mime_types );
+ $last2 = array_pop( $mime_types );
+
+ $mime_types[] = $last2 . ' ' . __( 'or', 'acf' ) . ' ' . $last1;
+
}
-
- $errors['mime_types'] = sprintf(__('File type must be %s.', 'acf'), implode(', ', $mime_types) );
-
+
+ $errors['mime_types'] = sprintf( __( 'File type must be %s.', 'acf' ), implode( ', ', $mime_types ) );
+
}
-
}
-
-
+
/**
* Filters the errors for a file before it is uploaded or displayed in the media modal.
*
- * @date 3/07/2015
- * @since 5.2.3
+ * @date 3/07/2015
+ * @since 5.2.3
*
- * @param array $errors An array of errors.
- * @param array $file An array of data for a single file.
- * @param array $attachment An array of attachment data which differs based on the context.
- * @param array $field The field array.
- * @param string $context The curent context (uploading, preparing)
+ * @param array $errors An array of errors.
+ * @param array $file An array of data for a single file.
+ * @param array $attachment An array of attachment data which differs based on the context.
+ * @param array $field The field array.
+ * @param string $context The curent context (uploading, preparing)
*/
- $errors = apply_filters( "acf/validate_attachment/type={$field['type']}", $errors, $file, $attachment, $field, $context );
- $errors = apply_filters( "acf/validate_attachment/name={$field['_name']}", $errors, $file, $attachment, $field, $context );
- $errors = apply_filters( "acf/validate_attachment/key={$field['key']}", $errors, $file, $attachment, $field, $context );
- $errors = apply_filters( "acf/validate_attachment", $errors, $file, $attachment, $field, $context );
-
-
+ $errors = apply_filters( "acf/validate_attachment/type={$field['type']}", $errors, $file, $attachment, $field, $context );
+ $errors = apply_filters( "acf/validate_attachment/name={$field['_name']}", $errors, $file, $attachment, $field, $context );
+ $errors = apply_filters( "acf/validate_attachment/key={$field['key']}", $errors, $file, $attachment, $field, $context );
+ $errors = apply_filters( 'acf/validate_attachment', $errors, $file, $attachment, $field, $context );
+
// return
return $errors;
-
+
}
@@ -3625,26 +3461,25 @@ function acf_validate_attachment( $attachment, $field, $context = 'prepare' ) {
*
* Dynamic logic for uploader setting
*
-* @type function
-* @date 7/05/2015
-* @since 5.2.3
+* @type function
+* @date 7/05/2015
+* @since 5.2.3
*
-* @param $uploader (string)
-* @return $uploader
+* @param $uploader (string)
+* @return $uploader
*/
-add_filter('acf/settings/uploader', '_acf_settings_uploader');
+add_filter( 'acf/settings/uploader', '_acf_settings_uploader' );
function _acf_settings_uploader( $uploader ) {
-
+
// if can't upload files
- if( !current_user_can('upload_files') ) {
-
+ if ( ! current_user_can( 'upload_files' ) ) {
+
$uploader = 'basic';
-
+
}
-
-
+
// return
return $uploader;
}
@@ -3655,37 +3490,37 @@ function _acf_settings_uploader( $uploader ) {
*
* description
*
-* @type function
-* @date 7/12/2015
-* @since 5.3.2
+* @type function
+* @date 7/12/2015
+* @since 5.3.2
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
/*
function acf_translate_keys( $array, $keys ) {
-
+
// bail early if no keys
if( empty($keys) ) return $array;
-
-
+
+
// translate
foreach( $keys as $k ) {
-
+
// bail ealry if not exists
if( !isset($array[ $k ]) ) continue;
-
-
+
+
// translate
$array[ $k ] = acf_translate( $array[ $k ] );
-
+
}
-
-
+
+
// return
return $array;
-
+
}
*/
@@ -3696,61 +3531,63 @@ function acf_translate_keys( $array, $keys ) {
* This function will translate a string using the new 'l10n_textdomain' setting
* Also works for arrays which is great for fields - select -> choices
*
-* @type function
-* @date 4/12/2015
-* @since 5.3.2
+* @type function
+* @date 4/12/2015
+* @since 5.3.2
*
-* @param $string (mixed) string or array containins strings to be translated
-* @return $string
+* @param $string (mixed) string or array containins strings to be translated
+* @return $string
*/
function acf_translate( $string ) {
-
+
// vars
- $l10n = acf_get_setting('l10n');
- $textdomain = acf_get_setting('l10n_textdomain');
-
-
+ $l10n = acf_get_setting( 'l10n' );
+ $textdomain = acf_get_setting( 'l10n_textdomain' );
+
// bail early if not enabled
- if( !$l10n ) return $string;
-
-
+ if ( ! $l10n ) {
+ return $string;
+ }
+
// bail early if no textdomain
- if( !$textdomain ) return $string;
-
-
+ if ( ! $textdomain ) {
+ return $string;
+ }
+
// is array
- if( is_array($string) ) {
-
- return array_map('acf_translate', $string);
-
+ if ( is_array( $string ) ) {
+
+ return array_map( 'acf_translate', $string );
+
}
-
-
+
// bail early if not string
- if( !is_string($string) ) return $string;
-
-
- // bail early if empty
- if( $string === '' ) return $string;
-
-
- // allow for var_export export
- if( acf_get_setting('l10n_var_export') ){
-
- // bail early if already translated
- if( substr($string, 0, 7) === '!!__(!!' ) return $string;
-
-
- // return
- return "!!__(!!'" . $string . "!!', !!'" . $textdomain . "!!')!!";
-
+ if ( ! is_string( $string ) ) {
+ return $string;
}
-
-
+
+ // bail early if empty
+ if ( $string === '' ) {
+ return $string;
+ }
+
+ // allow for var_export export
+ if ( acf_get_setting( 'l10n_var_export' ) ) {
+
+ // bail early if already translated
+ if ( substr( $string, 0, 7 ) === '!!__(!!' ) {
+ return $string;
+ }
+
+ // return
+ return "!!__(!!'" . $string . "!!', !!'" . $textdomain . "!!')!!";
+
+ }
+
// vars
return __( $string, $textdomain );
-
+
}
@@ -3759,29 +3596,29 @@ function acf_translate( $string ) {
*
* This function will determine if the action has already run before adding / calling the function
*
-* @type function
-* @date 13/01/2016
-* @since 5.3.2
+* @type function
+* @date 13/01/2016
+* @since 5.3.2
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_maybe_add_action( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
-
+
// if action has already run, execute it
// - if currently doing action, allow $tag to be added as per usual to allow $priority ordering needed for 3rd party asset compatibility
- if( did_action($tag) && !doing_action($tag) ) {
-
+ if ( did_action( $tag ) && ! doing_action( $tag ) ) {
+
call_user_func( $function_to_add );
-
- // if action has not yet run, add it
+
+ // if action has not yet run, add it
} else {
-
+
add_action( $tag, $function_to_add, $priority, $accepted_args );
-
+
}
-
+
}
@@ -3790,41 +3627,37 @@ function acf_maybe_add_action( $tag, $function_to_add, $priority = 10, $accepted
*
* This function will return true if the field's row is collapsed
*
-* @type function
-* @date 2/03/2016
-* @since 5.3.2
+* @type function
+* @date 2/03/2016
+* @since 5.3.2
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_is_row_collapsed( $field_key = '', $row_index = 0 ) {
-
+
// collapsed
- $collapsed = acf_get_user_setting('collapsed_' . $field_key, '');
-
-
+ $collapsed = acf_get_user_setting( 'collapsed_' . $field_key, '' );
+
// cookie fallback ( version < 5.3.2 )
- if( $collapsed === '' ) {
-
- $collapsed = acf_extract_var($_COOKIE, "acf_collapsed_{$field_key}", '');
- $collapsed = str_replace('|', ',', $collapsed);
-
-
+ if ( $collapsed === '' ) {
+
+ $collapsed = acf_extract_var( $_COOKIE, "acf_collapsed_{$field_key}", '' );
+ $collapsed = str_replace( '|', ',', $collapsed );
+
// update
acf_update_user_setting( 'collapsed_' . $field_key, $collapsed );
-
+
}
-
-
+
// explode
- $collapsed = explode(',', $collapsed);
- $collapsed = array_filter($collapsed, 'is_numeric');
-
-
+ $collapsed = explode( ',', $collapsed );
+ $collapsed = array_filter( $collapsed, 'is_numeric' );
+
// collapsed class
- return in_array($row_index, $collapsed);
-
+ return in_array( $row_index, $collapsed );
+
}
@@ -3833,28 +3666,28 @@ function acf_is_row_collapsed( $field_key = '', $row_index = 0 ) {
*
* description
*
-* @type function
-* @date 24/10/16
-* @since 5.5.0
+* @type function
+* @date 24/10/16
+* @since 5.5.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_get_attachment_image( $attachment_id = 0, $size = 'thumbnail' ) {
-
+
// vars
- $url = wp_get_attachment_image_src($attachment_id, 'thumbnail');
- $alt = get_post_meta($attachment_id, '_wp_attachment_image_alt', true);
-
-
+ $url = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
+ $alt = get_post_meta( $attachment_id, '_wp_attachment_image_alt', true );
+
// bail early if no url
- if( !$url ) return '';
-
-
+ if ( ! $url ) {
+ return '';
+ }
+
// return
$value = '
';
-
+
}
@@ -3863,77 +3696,71 @@ function acf_get_attachment_image( $attachment_id = 0, $size = 'thumbnail' ) {
*
* This function will return a thumbail image url for a given post
*
-* @type function
-* @date 3/05/2016
-* @since 5.3.8
+* @type function
+* @date 3/05/2016
+* @since 5.3.8
*
-* @param $post (obj)
-* @param $size (mixed)
-* @return (string)
+* @param $post (obj)
+* @param $size (mixed)
+* @return (string)
*/
function acf_get_post_thumbnail( $post = null, $size = 'thumbnail' ) {
-
+
// vars
$data = array(
- 'url' => '',
- 'type' => '',
- 'html' => ''
+ 'url' => '',
+ 'type' => '',
+ 'html' => '',
);
-
-
+
// post
- $post = get_post($post);
-
-
+ $post = get_post( $post );
+
// bail early if no post
- if( !$post ) return $data;
-
-
+ if ( ! $post ) {
+ return $data;
+ }
+
// vars
- $thumb_id = $post->ID;
- $mime_type = acf_maybe_get(explode('/', $post->post_mime_type), 0);
-
-
+ $thumb_id = $post->ID;
+ $mime_type = acf_maybe_get( explode( '/', $post->post_mime_type ), 0 );
+
// attachment
- if( $post->post_type === 'attachment' ) {
-
+ if ( $post->post_type === 'attachment' ) {
+
// change $thumb_id
- if( $mime_type === 'audio' || $mime_type === 'video' ) {
-
- $thumb_id = get_post_thumbnail_id($post->ID);
-
+ if ( $mime_type === 'audio' || $mime_type === 'video' ) {
+
+ $thumb_id = get_post_thumbnail_id( $post->ID );
+
}
-
- // post
+
+ // post
} else {
-
- $thumb_id = get_post_thumbnail_id($post->ID);
-
+
+ $thumb_id = get_post_thumbnail_id( $post->ID );
+
}
-
-
+
// try url
- $data['url'] = wp_get_attachment_image_src($thumb_id, $size);
- $data['url'] = acf_maybe_get($data['url'], 0);
-
-
+ $data['url'] = wp_get_attachment_image_src( $thumb_id, $size );
+ $data['url'] = acf_maybe_get( $data['url'], 0 );
+
// default icon
- if( !$data['url'] && $post->post_type === 'attachment' ) {
-
- $data['url'] = wp_mime_type_icon($post->ID);
+ if ( ! $data['url'] && $post->post_type === 'attachment' ) {
+
+ $data['url'] = wp_mime_type_icon( $post->ID );
$data['type'] = 'icon';
-
+
}
-
-
+
// html
$data['html'] = '
';
-
-
+
// return
return $data;
-
+
}
/**
@@ -3941,34 +3768,34 @@ function acf_get_post_thumbnail( $post = null, $size = 'thumbnail' ) {
*
* Returns the name of the current browser.
*
- * @date 17/01/2014
- * @since 5.0.0
+ * @date 17/01/2014
+ * @since 5.0.0
*
- * @param void
- * @return string
+ * @param void
+ * @return string
*/
function acf_get_browser() {
-
+
// Check server var.
- if( isset($_SERVER['HTTP_USER_AGENT']) ) {
+ if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
$agent = $_SERVER['HTTP_USER_AGENT'];
-
+
// Loop over search terms.
$browsers = array(
- 'Firefox' => 'firefox',
- 'Trident' => 'msie',
- 'MSIE' => 'msie',
- 'Edge' => 'edge',
- 'Chrome' => 'chrome',
- 'Safari' => 'safari',
+ 'Firefox' => 'firefox',
+ 'Trident' => 'msie',
+ 'MSIE' => 'msie',
+ 'Edge' => 'edge',
+ 'Chrome' => 'chrome',
+ 'Safari' => 'safari',
);
- foreach( $browsers as $k => $v ) {
- if( strpos($agent, $k) !== false ) {
+ foreach ( $browsers as $k => $v ) {
+ if ( strpos( $agent, $k ) !== false ) {
return $v;
}
}
}
-
+
// Return default.
return '';
}
@@ -3979,39 +3806,36 @@ function acf_get_browser() {
*
* This function will reutrn true if performing a wp ajax call
*
-* @type function
-* @date 7/06/2016
-* @since 5.3.8
+* @type function
+* @date 7/06/2016
+* @since 5.3.8
*
-* @param n/a
-* @return (boolean)
+* @param n/a
+* @return (boolean)
*/
function acf_is_ajax( $action = '' ) {
-
+
// vars
$is_ajax = false;
-
-
+
// check if is doing ajax
- if( defined('DOING_AJAX') && DOING_AJAX ) {
-
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+
$is_ajax = true;
-
+
}
-
-
+
// check $action
- if( $action && acf_maybe_get($_POST, 'action') !== $action ) {
-
+ if ( $action && acf_maybe_get( $_POST, 'action' ) !== $action ) {
+
$is_ajax = false;
-
+
}
-
-
+
// return
return $is_ajax;
-
+
}
@@ -4022,39 +3846,38 @@ function acf_is_ajax( $action = '' ) {
*
* This function will accept a date value and return it in a formatted string
*
-* @type function
-* @date 16/06/2016
-* @since 5.3.8
+* @type function
+* @date 16/06/2016
+* @since 5.3.8
*
-* @param $value (string)
-* @return $format (string)
+* @param $value (string)
+* @return $format (string)
*/
function acf_format_date( $value, $format ) {
-
+
// bail early if no value
- if( !$value ) return $value;
-
-
+ if ( ! $value ) {
+ return $value;
+ }
+
// vars
$unixtimestamp = 0;
-
-
+
// numeric (either unix or YYYYMMDD)
- if( is_numeric($value) && strlen($value) !== 8 ) {
-
+ if ( is_numeric( $value ) && strlen( $value ) !== 8 ) {
+
$unixtimestamp = $value;
-
+
} else {
-
- $unixtimestamp = strtotime($value);
-
+
+ $unixtimestamp = strtotime( $value );
+
}
-
-
+
// return
- return date_i18n($format, $unixtimestamp);
-
+ return date_i18n( $format, $unixtimestamp );
+
}
/**
@@ -4062,11 +3885,11 @@ function acf_format_date( $value, $format ) {
*
* Deletes the debug.log file.
*
- * @date 21/1/19
- * @since 5.7.10
+ * @date 21/1/19
+ * @since 5.7.10
*
- * @param type $var Description. Default.
- * @return type Description.
+ * @param type $var Description. Default.
+ * @return type Description.
*/
function acf_clear_log() {
unlink( WP_CONTENT_DIR . '/debug.log' );
@@ -4077,53 +3900,53 @@ function acf_clear_log() {
*
* description
*
-* @type function
-* @date 24/06/2016
-* @since 5.3.8
+* @type function
+* @date 24/06/2016
+* @since 5.3.8
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_log() {
-
+
// vars
$args = func_get_args();
-
+
// loop
- foreach( $args as $i => $arg ) {
-
+ foreach ( $args as $i => $arg ) {
+
// array | object
- if( is_array($arg) || is_object($arg) ) {
- $arg = print_r($arg, true);
-
- // bool
- } elseif( is_bool($arg) ) {
+ if ( is_array( $arg ) || is_object( $arg ) ) {
+ $arg = print_r( $arg, true );
+
+ // bool
+ } elseif ( is_bool( $arg ) ) {
$arg = 'bool(' . ( $arg ? 'true' : 'false' ) . ')';
}
-
+
// update
$args[ $i ] = $arg;
}
-
+
// log
- error_log( implode(' ', $args) );
+ error_log( implode( ' ', $args ) );
}
/**
-* acf_dev_log
-*
-* Used to log variables only if ACF_DEV is defined
-*
-* @date 25/8/18
-* @since 5.7.4
-*
-* @param mixed
-* @return void
-*/
+ * acf_dev_log
+ *
+ * Used to log variables only if ACF_DEV is defined
+ *
+ * @date 25/8/18
+ * @since 5.7.4
+ *
+ * @param mixed
+ * @return void
+ */
function acf_dev_log() {
- if( defined('ACF_DEV') && ACF_DEV ) {
- call_user_func_array('acf_log', func_get_args());
+ if ( defined( 'ACF_DEV' ) && ACF_DEV ) {
+ call_user_func_array( 'acf_log', func_get_args() );
}
}
@@ -4132,20 +3955,20 @@ function acf_dev_log() {
*
* This function will tell ACF what task it is doing
*
-* @type function
-* @date 28/06/2016
-* @since 5.3.8
+* @type function
+* @date 28/06/2016
+* @since 5.3.8
*
-* @param $event (string)
-* @param context (string)
-* @return n/a
+* @param $event (string)
+* @param context (string)
+* @return n/a
*/
function acf_doing( $event = '', $context = '' ) {
-
+
acf_update_setting( 'doing', $event );
acf_update_setting( 'doing_context', $context );
-
+
}
@@ -4154,40 +3977,37 @@ function acf_doing( $event = '', $context = '' ) {
*
* This function can be used to state what ACF is doing, or to check
*
-* @type function
-* @date 28/06/2016
-* @since 5.3.8
+* @type function
+* @date 28/06/2016
+* @since 5.3.8
*
-* @param $event (string)
-* @param context (string)
-* @return (boolean)
+* @param $event (string)
+* @param context (string)
+* @return (boolean)
*/
function acf_is_doing( $event = '', $context = '' ) {
-
+
// vars
$doing = false;
-
-
+
// task
- if( acf_get_setting('doing') === $event ) {
-
+ if ( acf_get_setting( 'doing' ) === $event ) {
+
$doing = true;
-
+
}
-
-
+
// context
- if( $context && acf_get_setting('doing_context') !== $context ) {
-
+ if ( $context && acf_get_setting( 'doing_context' ) !== $context ) {
+
$doing = false;
-
+
}
-
-
+
// return
return $doing;
-
+
}
@@ -4197,32 +4017,30 @@ function acf_is_doing( $event = '', $context = '' ) {
* This function will return true if the ACF plugin is active
* - May be included within a theme or other plugin
*
-* @type function
-* @date 13/07/2016
-* @since 5.4.0
+* @type function
+* @date 13/07/2016
+* @since 5.4.0
*
-* @param $basename (int)
-* @return $post_id (int)
+* @param $basename (int)
+* @return $post_id (int)
*/
function acf_is_plugin_active() {
-
+
// vars
- $basename = acf_get_setting('basename');
-
-
+ $basename = acf_get_setting( 'basename' );
+
// ensure is_plugin_active() exists (not on frontend)
- if( !function_exists('is_plugin_active') ) {
-
- include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
+ if ( ! function_exists( 'is_plugin_active' ) ) {
+
+ include_once ABSPATH . 'wp-admin/includes/plugin.php';
+
}
-
-
+
// return
- return is_plugin_active($basename);
-
+ return is_plugin_active( $basename );
+
}
/*
@@ -4230,59 +4048,56 @@ function acf_is_plugin_active() {
*
* This function will print JSON data for a Select2 AJAX query
*
-* @type function
-* @date 19/07/2016
-* @since 5.4.0
+* @type function
+* @date 19/07/2016
+* @since 5.4.0
*
-* @param $response (array)
-* @return n/a
+* @param $response (array)
+* @return n/a
*/
function acf_send_ajax_results( $response ) {
-
+
// validate
- $response = wp_parse_args($response, array(
- 'results' => array(),
- 'more' => false,
- 'limit' => 0
- ));
-
-
+ $response = wp_parse_args(
+ $response,
+ array(
+ 'results' => array(),
+ 'more' => false,
+ 'limit' => 0,
+ )
+ );
+
// limit
- if( $response['limit'] && $response['results']) {
-
+ if ( $response['limit'] && $response['results'] ) {
+
// vars
$total = 0;
-
- foreach( $response['results'] as $result ) {
-
+
+ foreach ( $response['results'] as $result ) {
+
// parent
$total++;
-
-
+
// children
- if( !empty($result['children']) ) {
-
+ if ( ! empty( $result['children'] ) ) {
+
$total += count( $result['children'] );
-
+
}
-
}
-
-
+
// calc
- if( $total >= $response['limit'] ) {
-
+ if ( $total >= $response['limit'] ) {
+
$response['more'] = true;
-
+
}
-
}
-
-
+
// return
wp_send_json( $response );
-
+
}
@@ -4291,33 +4106,34 @@ function acf_send_ajax_results( $response ) {
*
* This function will return true if the array contains only numeric keys
*
-* @source http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
-* @type function
-* @date 9/09/2016
-* @since 5.4.0
+* @source http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
+* @type function
+* @date 9/09/2016
+* @since 5.4.0
*
-* @param $array (array)
-* @return (boolean)
+* @param $array (array)
+* @return (boolean)
*/
function acf_is_sequential_array( $array ) {
-
+
// bail ealry if not array
- if( !is_array($array) ) return false;
-
-
- // loop
- foreach( $array as $key => $value ) {
-
- // bail ealry if is string
- if( is_string($key) ) return false;
-
+ if ( ! is_array( $array ) ) {
+ return false;
}
-
-
+
+ // loop
+ foreach ( $array as $key => $value ) {
+
+ // bail ealry if is string
+ if ( is_string( $key ) ) {
+ return false;
+ }
+ }
+
// return
return true;
-
+
}
@@ -4326,33 +4142,34 @@ function acf_is_sequential_array( $array ) {
*
* This function will return true if the array contains one or more string keys
*
-* @source http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
-* @type function
-* @date 9/09/2016
-* @since 5.4.0
+* @source http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
+* @type function
+* @date 9/09/2016
+* @since 5.4.0
*
-* @param $array (array)
-* @return (boolean)
+* @param $array (array)
+* @return (boolean)
*/
function acf_is_associative_array( $array ) {
-
+
// bail ealry if not array
- if( !is_array($array) ) return false;
-
-
- // loop
- foreach( $array as $key => $value ) {
-
- // bail ealry if is string
- if( is_string($key) ) return true;
-
+ if ( ! is_array( $array ) ) {
+ return false;
}
-
-
+
+ // loop
+ foreach ( $array as $key => $value ) {
+
+ // bail ealry if is string
+ if ( is_string( $key ) ) {
+ return true;
+ }
+ }
+
// return
return false;
-
+
}
@@ -4362,33 +4179,31 @@ function acf_is_associative_array( $array ) {
* This function will add a prefix to all array keys
* Useful to preserve numeric keys when performing array_multisort
*
-* @type function
-* @date 15/09/2016
-* @since 5.4.0
+* @type function
+* @date 15/09/2016
+* @since 5.4.0
*
-* @param $array (array)
-* @param $prefix (string)
-* @return (array)
+* @param $array (array)
+* @param $prefix (string)
+* @return (array)
*/
function acf_add_array_key_prefix( $array, $prefix ) {
-
+
// vars
$array2 = array();
-
-
+
// loop
- foreach( $array as $k => $v ) {
-
- $k2 = $prefix . $k;
- $array2[ $k2 ] = $v;
-
+ foreach ( $array as $k => $v ) {
+
+ $k2 = $prefix . $k;
+ $array2[ $k2 ] = $v;
+
}
-
-
+
// return
return $array2;
-
+
}
@@ -4398,56 +4213,54 @@ function acf_add_array_key_prefix( $array, $prefix ) {
* This function will remove a prefix to all array keys
* Useful to preserve numeric keys when performing array_multisort
*
-* @type function
-* @date 15/09/2016
-* @since 5.4.0
+* @type function
+* @date 15/09/2016
+* @since 5.4.0
*
-* @param $array (array)
-* @param $prefix (string)
-* @return (array)
+* @param $array (array)
+* @param $prefix (string)
+* @return (array)
*/
function acf_remove_array_key_prefix( $array, $prefix ) {
-
+
// vars
$array2 = array();
- $l = strlen($prefix);
-
-
+ $l = strlen( $prefix );
+
// loop
- foreach( $array as $k => $v ) {
-
- $k2 = (substr($k, 0, $l) === $prefix) ? substr($k, $l) : $k;
- $array2[ $k2 ] = $v;
-
+ foreach ( $array as $k => $v ) {
+
+ $k2 = ( substr( $k, 0, $l ) === $prefix ) ? substr( $k, $l ) : $k;
+ $array2[ $k2 ] = $v;
+
}
-
-
+
// return
return $array2;
-
+
}
/*
* acf_strip_protocol
*
-* This function will remove the proticol from a url
-* Used to allow licences to remain active if a site is switched to https
+* This function will remove the proticol from a url
+* Used to allow licences to remain active if a site is switched to https
*
-* @type function
-* @date 10/01/2017
-* @since 5.5.4
-* @author Aaron
+* @type function
+* @date 10/01/2017
+* @since 5.5.4
+* @author Aaron
*
-* @param $url (string)
-* @return (string)
+* @param $url (string)
+* @return (string)
*/
function acf_strip_protocol( $url ) {
-
- // strip the protical
- return str_replace(array('http://','https://'), '', $url);
+
+ // strip the protical
+ return str_replace( array( 'http://', 'https://' ), '', $url );
}
@@ -4455,57 +4268,62 @@ function acf_strip_protocol( $url ) {
/*
* acf_connect_attachment_to_post
*
-* This function will connect an attacment (image etc) to the post
+* This function will connect an attacment (image etc) to the post
* Used to connect attachements uploaded directly to media that have not been attaced to a post
*
-* @type function
-* @date 11/01/2017
-* @since 5.8.0 Added filter to prevent connection.
-* @since 5.5.4
+* @type function
+* @date 11/01/2017
+* @since 5.8.0 Added filter to prevent connection.
+* @since 5.5.4
*
-* @param int $attachment_id The attachment ID.
-* @param int $post_id The post ID.
-* @return bool True if attachment was connected.
+* @param int $attachment_id The attachment ID.
+* @param int $post_id The post ID.
+* @return bool True if attachment was connected.
*/
function acf_connect_attachment_to_post( $attachment_id = 0, $post_id = 0 ) {
-
+
// Bail ealry if $attachment_id is not valid.
- if( !$attachment_id || !is_numeric($attachment_id) ) {
+ if ( ! $attachment_id || ! is_numeric( $attachment_id ) ) {
return false;
}
-
+
// Bail ealry if $post_id is not valid.
- if( !$post_id || !is_numeric($post_id) ) {
+ if ( ! $post_id || ! is_numeric( $post_id ) ) {
return false;
}
-
+
/**
* Filters whether or not to connect the attachment.
*
- * @date 8/11/18
- * @since 5.8.0
+ * @date 8/11/18
+ * @since 5.8.0
*
- * @param bool $bool Returning false will prevent the connection. Default true.
- * @param int $attachment_id The attachment ID.
- * @param int $post_id The post ID.
+ * @param bool $bool Returning false will prevent the connection. Default true.
+ * @param int $attachment_id The attachment ID.
+ * @param int $post_id The post ID.
*/
- if( !apply_filters('acf/connect_attachment_to_post', true, $attachment_id, $post_id) ) {
+ if ( ! apply_filters( 'acf/connect_attachment_to_post', true, $attachment_id, $post_id ) ) {
return false;
}
-
- // vars
+
+ // vars
$post = get_post( $attachment_id );
-
+
// Check if is valid post.
- if( $post && $post->post_type == 'attachment' && $post->post_parent == 0 ) {
-
+ if ( $post && $post->post_type == 'attachment' && $post->post_parent == 0 ) {
+
// update
- wp_update_post( array('ID' => $post->ID, 'post_parent' => $post_id) );
-
+ wp_update_post(
+ array(
+ 'ID' => $post->ID,
+ 'post_parent' => $post_id,
+ )
+ );
+
// return
return true;
}
-
+
// return
return true;
}
@@ -4517,36 +4335,34 @@ function acf_connect_attachment_to_post( $attachment_id = 0, $post_id = 0 ) {
* This function will encrypt a string using PHP
* https://bhoover.com/using-php-openssl_encrypt-openssl_decrypt-encrypt-decrypt-data/
*
-* @type function
-* @date 27/2/17
-* @since 5.5.8
+* @type function
+* @date 27/2/17
+* @since 5.5.8
*
-* @param $data (string)
-* @return (string)
+* @param $data (string)
+* @return (string)
*/
function acf_encrypt( $data = '' ) {
-
+
// bail ealry if no encrypt function
- if( !function_exists('openssl_encrypt') ) return base64_encode($data);
-
-
+ if ( ! function_exists( 'openssl_encrypt' ) ) {
+ return base64_encode( $data );
+ }
+
// generate a key
- $key = wp_hash('acf_encrypt');
-
-
- // Generate an initialization vector
- $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length('aes-256-cbc'));
-
-
- // Encrypt the data using AES 256 encryption in CBC mode using our encryption key and initialization vector.
- $encrypted_data = openssl_encrypt($data, 'aes-256-cbc', $key, 0, $iv);
-
-
- // The $iv is just as important as the key for decrypting, so save it with our encrypted data using a unique separator (::)
- return base64_encode($encrypted_data . '::' . $iv);
-
+ $key = wp_hash( 'acf_encrypt' );
+
+ // Generate an initialization vector
+ $iv = openssl_random_pseudo_bytes( openssl_cipher_iv_length( 'aes-256-cbc' ) );
+
+ // Encrypt the data using AES 256 encryption in CBC mode using our encryption key and initialization vector.
+ $encrypted_data = openssl_encrypt( $data, 'aes-256-cbc', $key, 0, $iv );
+
+ // The $iv is just as important as the key for decrypting, so save it with our encrypted data using a unique separator (::)
+ return base64_encode( $encrypted_data . '::' . $iv );
+
}
@@ -4556,209 +4372,208 @@ function acf_encrypt( $data = '' ) {
* This function will decrypt an encrypted string using PHP
* https://bhoover.com/using-php-openssl_encrypt-openssl_decrypt-encrypt-decrypt-data/
*
-* @type function
-* @date 27/2/17
-* @since 5.5.8
+* @type function
+* @date 27/2/17
+* @since 5.5.8
*
-* @param $data (string)
-* @return (string)
+* @param $data (string)
+* @return (string)
*/
function acf_decrypt( $data = '' ) {
-
+
// bail ealry if no decrypt function
- if( !function_exists('openssl_decrypt') ) return base64_decode($data);
-
-
+ if ( ! function_exists( 'openssl_decrypt' ) ) {
+ return base64_decode( $data );
+ }
+
// generate a key
- $key = wp_hash('acf_encrypt');
-
-
- // To decrypt, split the encrypted data from our IV - our unique separator used was "::"
- list($encrypted_data, $iv) = explode('::', base64_decode($data), 2);
-
-
- // decrypt
- return openssl_decrypt($encrypted_data, 'aes-256-cbc', $key, 0, $iv);
-
+ $key = wp_hash( 'acf_encrypt' );
+
+ // To decrypt, split the encrypted data from our IV - our unique separator used was "::"
+ list($encrypted_data, $iv) = explode( '::', base64_decode( $data ), 2 );
+
+ // decrypt
+ return openssl_decrypt( $encrypted_data, 'aes-256-cbc', $key, 0, $iv );
+
}
/**
-* acf_parse_markdown
-*
-* A very basic regex-based Markdown parser function based off [slimdown](https://gist.github.com/jbroadway/2836900).
-*
-* @date 6/8/18
-* @since 5.7.2
-*
-* @param string $text The string to parse.
-* @return string
-*/
+ * acf_parse_markdown
+ *
+ * A very basic regex-based Markdown parser function based off [slimdown](https://gist.github.com/jbroadway/2836900).
+ *
+ * @date 6/8/18
+ * @since 5.7.2
+ *
+ * @param string $text The string to parse.
+ * @return string
+ */
function acf_parse_markdown( $text = '' ) {
-
+
// trim
- $text = trim($text);
-
+ $text = trim( $text );
+
// rules
- $rules = array (
- '/=== (.+?) ===/' => '
| - 'select', - 'prefix' => $prefix, - 'name' => 'field', - 'class' => 'condition-rule-field', - 'disabled' => $disabled, - 'value' => $rule['field'], - 'choices' => array( - $rule['field'] => $rule['field'] + 'select', + 'prefix' => $prefix, + 'name' => 'field', + 'class' => 'condition-rule-field', + 'disabled' => $disabled, + 'value' => $rule['field'], + 'choices' => array( + $rule['field'] => $rule['field'], + ), ) - )); - + ); + ?> | - 'select', - 'prefix' => $prefix, - 'name' => 'operator', - 'class' => 'condition-rule-operator', - 'disabled' => $disabled, - 'value' => $rule['operator'], - 'choices' => array( - $rule['operator'] => $rule['operator'] + 'select', + 'prefix' => $prefix, + 'name' => 'operator', + 'class' => 'condition-rule-operator', + 'disabled' => $disabled, + 'value' => $rule['operator'], + 'choices' => array( + $rule['operator'] => $rule['operator'], + ), ) - )); - + ); + ?> | - 'select', - 'prefix' => $prefix, - 'name' => 'value', - 'class' => 'condition-rule-value', - 'disabled' => $disabled, - 'value' => $rule['value'], - 'choices' => array( - $rule['value'] => $rule['value'] + acf_render_field( + array( + 'type' => 'select', + 'prefix' => $prefix, + 'name' => 'value', + 'class' => 'condition-rule-value', + 'disabled' => $disabled, + 'value' => $rule['value'], + 'choices' => array( + $rule['value'] => $rule['value'], + ), ) - )); - + ); + ?> | - + | @@ -148,11 +167,11 @@ if( empty($field['conditional_logic']) ) { - + - + | -
|
@@ -185,4 +221,4 @@ $field_type_label = acf_get_field_type_label( $field['type'] );
-
-
-
-
-
-
+
+
+
+
+
+
- 'acfcloneindex',
- 'key' => 'acfcloneindex',
- 'label' => __('New Field','acf'),
- 'name' => 'new_field',
- 'type' => 'text'
- ));
-
+ $clone = acf_get_valid_field(
+ array(
+ 'ID' => 'acfcloneindex',
+ 'key' => 'acfcloneindex',
+ 'label' => __( 'New Field', 'acf' ),
+ 'name' => 'new_field',
+ 'type' => 'text',
+ )
+ );
+
?>
-
+
-
\ No newline at end of file
+
- + Add Field button to create your first field.",'acf'); ?>
+ + Add Field button to create your first field.', 'acf' ); ?>
- $field ):
-
- acf_get_view('field-group-field', array( 'field' => $field, 'i' => $i ));
-
+ $field ) :
+
+ acf_get_view(
+ 'field-group-field',
+ array(
+ 'field' => $field,
+ 'i' => $i,
+ )
+ );
+
endforeach;
-
- endif; ?>
+
+ endif;
+ ?>
-
-
+
+
- $group ):
-
+ $group ) :
+
// bail ealry if no group
- if( empty($group) ) return;
-
-
+ if ( empty( $group ) ) {
+ return;
+ }
+
+
// view
- acf_get_view('html-location-group', array(
- 'group' => $group,
- 'group_id' => "group_{$i}"
- ));
+ acf_get_view(
+ 'html-location-group',
+ array(
+ 'group' => $group,
+ 'group_id' => "group_{$i}",
+ )
+ );
+
+ endforeach;
+ ?>
- endforeach; ?>
+
-
-
-
+
' . __("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)",'acf'), - 'type' => 'checkbox', - 'name' => 'hide_on_screen', - 'prefix' => 'acf_field_group', - 'value' => $field_group['hide_on_screen'], - 'toggle' => true, - 'choices' => $choices -)); +acf_render_field_wrap( + array( + 'label' => __( 'Hide on screen', 'acf' ), + 'instructions' => __( 'Select items to hide them from the edit screen.', 'acf' ) . '
' . __( "If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)", 'acf' ), + 'type' => 'checkbox', + 'name' => 'hide_on_screen', + 'prefix' => 'acf_field_group', + 'value' => $field_group['hide_on_screen'], + 'toggle' => true, + 'choices' => $choices, + ) +); // 3rd party settings -do_action('acf/render_field_group_settings', $field_group); - +do_action( 'acf/render_field_group_settings', $field_group ); + ?>
@@ -152,4 +168,4 @@ if( typeof acf !== 'undefined' ) {
});
}
-
\ No newline at end of file
+
diff --git a/includes/admin/views/html-admin-navigation.php b/includes/admin/views/html-admin-navigation.php
index ecf145f..d3e6e9e 100644
--- a/includes/admin/views/html-admin-navigation.php
+++ b/includes/admin/views/html-admin-navigation.php
@@ -1,12 +1,14 @@
- $sub_item ) {
-
+if ( isset( $submenu[ $parent_slug ] ) ) {
+ foreach ( $submenu[ $parent_slug ] as $i => $sub_item ) {
+
// Check user can access page.
- if ( !current_user_can( $sub_item[1] ) ) {
+ if ( ! current_user_can( $sub_item[1] ) ) {
continue;
}
-
+
// Ignore "Add New".
- if( $i === 1 ) {
+ if ( $i === 1 ) {
continue;
}
-
+
// Define tab.
$tab = array(
- 'text' => $sub_item[0],
- 'url' => $sub_item[2]
+ 'text' => $sub_item[0],
+ 'url' => $sub_item[2],
);
-
+
// Convert submenu slug "test" to "$parent_slug&page=test".
- if( !strpos($sub_item[2], '.php') ) {
+ if ( ! strpos( $sub_item[2], '.php' ) ) {
$tab['url'] = add_query_arg( array( 'page' => $sub_item[2] ), $parent_slug );
}
-
+
// Detect active state.
- if( $submenu_file === $sub_item[2] || $plugin_page === $sub_item[2] ) {
+ if ( $submenu_file === $sub_item[2] || $plugin_page === $sub_item[2] ) {
$tab['is_active'] = true;
}
-
+
// Special case for "Add New" page.
- if( $i === 0 && $submenu_file === 'post-new.php?post_type=acf-field-group' ) {
+ if ( $i === 0 && $submenu_file === 'post-new.php?post_type=acf-field-group' ) {
$tab['is_active'] = true;
}
$tabs[] = $tab;
@@ -55,35 +57,37 @@ if( isset($submenu[ $parent_slug ]) ) {
/**
* Filters the admin navigation tabs.
*
- * @date 27/3/20
- * @since 5.9.0
+ * @date 27/3/20
+ * @since 5.9.0
*
- * @param array $tabs The array of navigation tabs.
+ * @param array $tabs The array of navigation tabs.
*/
$tabs = apply_filters( 'acf/admin/toolbar', $tabs );
// Bail early if set to false.
-if( $tabs === false ) {
+if ( $tabs === false ) {
return;
}
?>
\ No newline at end of file
+
diff --git a/includes/admin/views/html-admin-page-upgrade-network.php b/includes/admin/views/html-admin-page-upgrade-network.php
index 903733e..9ee2a5b 100644
--- a/includes/admin/views/html-admin-page-upgrade-network.php
+++ b/includes/admin/views/html-admin-page-upgrade-network.php
@@ -1,14 +1,14 @@
; ?>){kind=icon}
-
- ; ?>){kind=icon}
+
+
-
+
-
-
+
+
@@ -33,9 +33,9 @@
-
-
\ No newline at end of file
+| - + | -+ | @@ -44,53 +44,57 @@ | - + | -+ | $site ): - - // switch blog - switch_to_blog( $site['blog_id'] ); - - ?> - |
|---|---|---|
| - + |
- + |
- - - - + + + + |
Return to network dashboard', 'acf'), network_admin_url() ); ?>
+ +Return to network dashboard', 'acf' ), network_admin_url() ); ?>
-
-
+
-
+
-
-
\ No newline at end of file
+
diff --git a/includes/admin/views/html-admin-tools.php b/includes/admin/views/html-admin-tools.php
index 145ac6c..6e87aaa 100644
--- a/includes/admin/views/html-admin-tools.php
+++ b/includes/admin/views/html-admin-tools.php
@@ -1,27 +1,30 @@
-
\ No newline at end of file
+
diff --git a/includes/admin/views/html-location-group.php b/includes/admin/views/html-location-group.php
index 14dc961..804f9fe 100644
--- a/includes/admin/views/html-location-group.php
+++ b/includes/admin/views/html-location-group.php
@@ -1,25 +1,30 @@
+ +
-
See what\'s new', 'acf' ), admin_url('edit.php?post_type=acf-field-group') ); ?>
+See what\'s new', 'acf' ), admin_url( 'edit.php?post_type=acf-field-group' ) ); ?>
- + - + -
-
+
- $rule ):
-
+ $rule ) :
+
// validate rule
- $rule = acf_validate_location_rule($rule);
-
+ $rule = acf_validate_location_rule( $rule );
+
// append id and group
- $rule['id'] = "rule_{$i}";
+ $rule['id'] = "rule_{$i}";
$rule['group'] = $group_id;
-
+
// view
- acf_get_view('html-location-rule', array(
- 'rule' => $rule
- ));
-
- endforeach; ?>
+ acf_get_view(
+ 'html-location-rule',
+ array(
+ 'rule' => $rule,
+ )
+ );
+
+ endforeach;
+ ?>
-
\ No newline at end of file
+
diff --git a/includes/admin/views/html-location-rule.php b/includes/admin/views/html-location-rule.php
index 1171133..2e99bc8 100644
--- a/includes/admin/views/html-location-rule.php
+++ b/includes/admin/views/html-location-rule.php
@@ -1,91 +1,97 @@
-
- ; ?>)
-
- ; ?>)
+
+
@@ -30,7 +37,7 @@ if( !acf_get_setting('pro') ) {
-
+
-
\ No newline at end of file
+
diff --git a/includes/ajax/class-acf-ajax-check-screen.php b/includes/ajax/class-acf-ajax-check-screen.php
index c56eb56..5438bd8 100644
--- a/includes/ajax/class-acf-ajax-check-screen.php
+++ b/includes/ajax/class-acf-ajax-check-screen.php
@@ -1,98 +1,103 @@
request, array(
- 'screen' => '',
- 'post_id' => 0,
- 'ajax' => true,
- 'exists' => array()
- ));
-
- // vars
- $response = array(
- 'results' => array(),
- 'style' => ''
- );
-
- // get field groups
- $field_groups = acf_get_field_groups( $args );
-
- // loop through field groups
- if( $field_groups ) {
- foreach( $field_groups as $i => $field_group ) {
-
- // vars
- $item = array(
- 'id' => 'acf-' . $field_group['key'],
- 'key' => $field_group['key'],
- 'title' => $field_group['title'],
- 'position' => $field_group['position'],
- 'style' => $field_group['style'],
- 'label' => $field_group['label_placement'],
- 'edit' => acf_get_field_group_edit_link( $field_group['ID'] ),
- 'html' => ''
- );
-
- // append html if doesnt already exist on page
- if( !in_array($field_group['key'], $args['exists']) ) {
-
- // load fields
- $fields = acf_get_fields( $field_group );
-
- // get field HTML
- ob_start();
-
- // render
- acf_render_fields( $fields, $args['post_id'], 'div', $field_group['instruction_placement'] );
-
- $item['html'] = ob_get_clean();
- }
-
- // append
- $response['results'][] = $item;
- }
-
- // Get style from first field group.
- $response['style'] = acf_get_field_group_style( $field_groups[0] );
- }
-
- // Custom metabox order.
- if( $this->get('screen') == 'post' ) {
- $response['sorted'] = get_user_option('meta-box-order_' . $this->get('post_type'));
- }
-
- // return
- return $response;
- }
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly
}
-acf_new_instance('ACF_Ajax_Check_Screen');
+if ( ! class_exists( 'ACF_Ajax_Check_Screen' ) ) :
+
+ class ACF_Ajax_Check_Screen extends ACF_Ajax {
+
+ /** @var string The AJAX action name. */
+ var $action = 'acf/ajax/check_screen';
+
+ /** @var bool Prevents access for non-logged in users. */
+ var $public = false;
+
+ /**
+ * get_response
+ *
+ * Returns the response data to sent back.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return mixed The response data or WP_Error.
+ */
+ function get_response( $request ) {
+
+ // vars
+ $args = wp_parse_args(
+ $this->request,
+ array(
+ 'screen' => '',
+ 'post_id' => 0,
+ 'ajax' => true,
+ 'exists' => array(),
+ )
+ );
+
+ // vars
+ $response = array(
+ 'results' => array(),
+ 'style' => '',
+ );
+
+ // get field groups
+ $field_groups = acf_get_field_groups( $args );
+
+ // loop through field groups
+ if ( $field_groups ) {
+ foreach ( $field_groups as $i => $field_group ) {
+
+ // vars
+ $item = array(
+ 'id' => 'acf-' . $field_group['key'],
+ 'key' => $field_group['key'],
+ 'title' => $field_group['title'],
+ 'position' => $field_group['position'],
+ 'style' => $field_group['style'],
+ 'label' => $field_group['label_placement'],
+ 'edit' => acf_get_field_group_edit_link( $field_group['ID'] ),
+ 'html' => '',
+ );
+
+ // append html if doesnt already exist on page
+ if ( ! in_array( $field_group['key'], $args['exists'] ) ) {
+
+ // load fields
+ $fields = acf_get_fields( $field_group );
+
+ // get field HTML
+ ob_start();
+
+ // render
+ acf_render_fields( $fields, $args['post_id'], 'div', $field_group['instruction_placement'] );
+
+ $item['html'] = ob_get_clean();
+ }
+
+ // append
+ $response['results'][] = $item;
+ }
+
+ // Get style from first field group.
+ $response['style'] = acf_get_field_group_style( $field_groups[0] );
+ }
+
+ // Custom metabox order.
+ if ( $this->get( 'screen' ) == 'post' ) {
+ $response['sorted'] = get_user_option( 'meta-box-order_' . $this->get( 'post_type' ) );
+ }
+
+ // return
+ return $response;
+ }
+ }
+
+ acf_new_instance( 'ACF_Ajax_Check_Screen' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/ajax/class-acf-ajax-local-json-diff.php b/includes/ajax/class-acf-ajax-local-json-diff.php
index a3ca7bb..7a370db 100644
--- a/includes/ajax/class-acf-ajax-local-json-diff.php
+++ b/includes/ajax/class-acf-ajax-local-json-diff.php
@@ -1,69 +1,71 @@
404 ) );
- }
-
- // Disable filters and load field group directly from database.
- acf_disable_filters();
- $field_group = acf_get_field_group( $id );
- if( !$field_group ) {
- return new WP_Error( 'acf_invalid_id', __( 'Invalid field group ID.', 'acf' ), array( 'status' => 404 ) );
- }
- $field_group['fields'] = acf_get_fields( $field_group );
- $field_group['modified'] = get_post_modified_time( 'U', true, $field_group['ID'] );
- $field_group = acf_prepare_field_group_for_export( $field_group );
-
- // Load local field group file.
- $files = acf_get_local_json_files();
- $key = $field_group['key'];
- if( !isset( $files[ $key ] ) ) {
- return new WP_Error( 'acf_cannot_compare', __( 'Sorry, this field group is unavailable for diff comparison.', 'acf' ), array( 'status' => 404 ) );
- }
- $local_field_group = json_decode( file_get_contents( $files[ $key ] ), true );
-
- // Render diff HTML.
- $date_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
- $date_template = __( 'Last updated: %s', 'acf' );
- $json['html'] = '
+ class ACF_Ajax_Local_JSON_Diff extends ACF_Ajax {
+
+ /** @var string The AJAX action name. */
+ var $action = 'acf/ajax/local_json_diff';
+
+ /** @var bool Prevents access for non-logged in users. */
+ var $public = false;
+
+ /**
+ * get_response
+ *
+ * Returns the response data to sent back.
+ *
+ * @date 31/7/18
+ * @since 5.7.2
+ *
+ * @param array $request The request args.
+ * @return mixed The response data or WP_Error.
+ */
+ function get_response( $request ) {
+ $json = array();
+
+ // Extract props.
+ $id = isset( $request['id'] ) ? intval( $request['id'] ) : 0;
+
+ // Bail ealry if missing props.
+ if ( ! $id ) {
+ return new WP_Error( 'acf_invalid_param', __( 'Invalid field group parameter(s).', 'acf' ), array( 'status' => 404 ) );
+ }
+
+ // Disable filters and load field group directly from database.
+ acf_disable_filters();
+ $field_group = acf_get_field_group( $id );
+ if ( ! $field_group ) {
+ return new WP_Error( 'acf_invalid_id', __( 'Invalid field group ID.', 'acf' ), array( 'status' => 404 ) );
+ }
+ $field_group['fields'] = acf_get_fields( $field_group );
+ $field_group['modified'] = get_post_modified_time( 'U', true, $field_group['ID'] );
+ $field_group = acf_prepare_field_group_for_export( $field_group );
+
+ // Load local field group file.
+ $files = acf_get_local_json_files();
+ $key = $field_group['key'];
+ if ( ! isset( $files[ $key ] ) ) {
+ return new WP_Error( 'acf_cannot_compare', __( 'Sorry, this field group is unavailable for diff comparison.', 'acf' ), array( 'status' => 404 ) );
+ }
+ $local_field_group = json_decode( file_get_contents( $files[ $key ] ), true );
+
+ // Render diff HTML.
+ $date_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+ $date_template = __( 'Last updated: %s', 'acf' );
+ $json['html'] = '
-
-
+
+
- ' . __( 'Original field group', 'acf' ) . '
+ ' . __( 'Original field group', 'acf' ) . '
' . sprintf( $date_template, wp_date( $date_format, $field_group['modified'] ) ) . '
- ' . __( 'JSON field group (newer)', 'acf' ) . '
+ ' . __( 'JSON field group (newer)', 'acf' ) . '
' . sprintf( $date_template, wp_date( $date_format, $local_field_group['modified'] ) ) . '
$1
', // headings - '/== (.+?) ==/' => '$1
', // headings - '/= (.+?) =/' => '$1
', // headings - '/\[([^\[]+)\]\(([^\)]+)\)/' => '$1', // links - '/(\*\*)(.*?)\1/' => '$2', // bold - '/(\*)(.*?)\1/' => '$2', // intalic - '/`(.*?)`/' => '$1', // inline code
- '/\n\*(.*)/' => "\n- \n\t
- $1 \n
- \n\t
- $1 \n
- /' => '', // fix extra ul
- '/<\/ol>\s?
- $1 \n
- $1 \n
- ' . acf_get_checkbox_input($atts) . ' ' . "\n"; - - } - - - /* - * render_field_custom - * - * description - * - * @type function - * @date 15/7/17 - * @since 5.6.0 - * - * @param $post_id (int) - * @return $post_id (int) - */ - - function render_field_custom( $field ) { - - // vars - $html = ''; - - - // loop - foreach( $field['value'] as $value ) { - - // ignore if already eixsts - if( isset($field['choices'][ $value ]) ) continue; - - // vars - $esc_value = esc_attr($value); - $text_input = array( - 'name' => $field['name'], - 'value' => $value, + $this->name = 'checkbox'; + $this->label = __( 'Checkbox', 'acf' ); + $this->category = 'choice'; + $this->defaults = array( + 'layout' => 'vertical', + 'choices' => array(), + 'default_value' => '', + 'allow_custom' => 0, + 'save_custom' => 0, + 'toggle' => 0, + 'return_format' => 'value', ); - - - // bail ealry if choice already exists - if( in_array( $esc_value, $this->_values ) ) continue; - - - // append - $html .= '
- ' . acf_get_text_input($text_input) . ' ' . "\n"; - - } - - - // append button - $html .= '
- ' . esc_attr__('Add new choice', 'acf') . ' ' . "\n"; - - - // return - return $html; - - } - - - function walk( $choices = array(), $args = array(), $depth = 0 ) { - - // bail ealry if no choices - if( empty($choices) ) return ''; - - - // defaults - $args = wp_parse_args($args, array( - 'id' => '', - 'type' => 'checkbox', - 'name' => '', - 'value' => array(), - 'disabled' => array(), - )); - - - // vars - $html = ''; - - - // sanitize values for 'selected' matching - if( $depth == 0 ) { - $args['value'] = array_map('esc_attr', $args['value']); - $args['disabled'] = array_map('esc_attr', $args['disabled']); - } - - - // loop - foreach( $choices as $value => $label ) { - - // open - $html .= '
- ';
-
-
- // optgroup
- if( is_array($label) ){
-
- $html .= '
- ' . "\n";
- $html .= $this->walk( $label, $args, $depth+1 );
- $html .= '
' . "\n";
-
- }
-
-
- // return
- return $html;
-
- }
-
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- function render_field_settings( $field ) {
-
- // encode choices (convert from array)
- $field['choices'] = acf_encode_choices($field['choices']);
- $field['default_value'] = acf_encode_choices($field['default_value'], false);
-
-
- // choices
- acf_render_field_setting( $field, array(
- 'label' => __('Choices','acf'),
- 'instructions' => __('Enter each choice on a new line.','acf') . ' - ' . acf_get_checkbox_input( $atts ) . ' ' . "\n"; + + } + + + /* + * render_field_custom + * + * description + * + * @type function + * @date 15/7/17 + * @since 5.6.0 + * + * @param $post_id (int) + * @return $post_id (int) + */ + + function render_field_custom( $field ) { + + // vars + $html = ''; + // loop - foreach( $value as $v ) { - + foreach ( $field['value'] as $value ) { + // ignore if already eixsts - if( isset($field['choices'][ $v ]) ) continue; - - - // unslash (fixes serialize single quote issue) - $v = wp_unslash($v); - - - // sanitize (remove tags) - $v = sanitize_text_field($v); - - + if ( isset( $field['choices'][ $value ] ) ) { + continue; + } + + // vars + $esc_value = esc_attr( $value ); + $text_input = array( + 'name' => $field['name'], + 'value' => $value, + ); + + // bail ealry if choice already exists + if ( in_array( $esc_value, $this->_values ) ) { + continue; + } + // append - $field['choices'][ $v ] = $v; - + $html .= '
- ' . acf_get_text_input( $text_input ) . ' ' . "\n"; + } - - - // save - acf_update_field( $field ); - - } - - - // return - return $value; - - } - - - /* - * translate_field - * - * This function will translate field settings - * - * @type function - * @date 8/03/2016 - * @since 5.3.2 - * - * @param $field (array) - * @return $field - */ - - function translate_field( $field ) { - - return acf_get_field_type('select')->translate_field( $field ); - - } - - - /* - * format_value() - * - * This filter is appied to the $value after it is loaded from the db and before it is returned to the template - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $value (mixed) the value which was loaded from the database - * @param $post_id (mixed) the $post_id from which the value was loaded - * @param $field (array) the field array holding all the field options - * - * @return $value (mixed) the modified value - */ - - function format_value( $value, $post_id, $field ) { - - // Bail early if is empty. - if( acf_is_empty($value) ) { - return array(); + + // append button + $html .= '
- ' . esc_attr__( 'Add new choice', 'acf' ) . ' ' . "\n"; + + // return + return $html; + } - - // Always convert to array of items. - $value = acf_array($value); - - // Return. - return acf_get_field_type('select')->format_value( $value, $post_id, $field ); + + + function walk( $choices = array(), $args = array(), $depth = 0 ) { + + // bail ealry if no choices + if ( empty( $choices ) ) { + return ''; + } + + // defaults + $args = wp_parse_args( + $args, + array( + 'id' => '', + 'type' => 'checkbox', + 'name' => '', + 'value' => array(), + 'disabled' => array(), + ) + ); + + // vars + $html = ''; + + // sanitize values for 'selected' matching + if ( $depth == 0 ) { + $args['value'] = array_map( 'esc_attr', $args['value'] ); + $args['disabled'] = array_map( 'esc_attr', $args['disabled'] ); + } + + // loop + foreach ( $choices as $value => $label ) { + + // open + $html .= '
- ';
+
+ // optgroup
+ if ( is_array( $label ) ) {
+
+ $html .= '
- ' . "\n";
+ $html .= $this->walk( $label, $args, $depth + 1 );
+ $html .= '
' . "\n";
+
+ }
+
+ // return
+ return $html;
+
+ }
+
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // encode choices (convert from array)
+ $field['choices'] = acf_encode_choices( $field['choices'] );
+ $field['default_value'] = acf_encode_choices( $field['default_value'], false );
+
+ // choices
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Choices', 'acf' ),
+ 'instructions' => __( 'Enter each choice on a new line.', 'acf' ) . ' - - $field['name'].'[]', 'value' => $post->ID) ); ?> - - get_post_title( $post, $field ) ); ?> + $field['name'] . '[]', + 'value' => $post->ID, + ) + ); + ?> + + get_post_title( $post, $field ) ); ?> - - + +
- /' => '', // fix extra ol
+ $rules = array(
+ '/=== (.+?) ===/' => '
$1
', // headings + '/== (.+?) ==/' => '$1
', // headings + '/= (.+?) =/' => '$1
', // headings + '/\[([^\[]+)\]\(([^\)]+)\)/' => '$1', // links + '/(\*\*)(.*?)\1/' => '$2', // bold + '/(\*)(.*?)\1/' => '$2', // intalic + '/`(.*?)`/' => '$1', // inline code
+ '/\n\*(.*)/' => "\n- \n\t
- \n\t
- /' => '', // fix extra ul
+ '/<\/ol>\s?
- /' => '', // fix extra ol
);
- foreach( $rules as $k => $v ) {
- $text = preg_replace($k, $v, $text);
+ foreach ( $rules as $k => $v ) {
+ $text = preg_replace( $k, $v, $text );
}
-
+
// autop
- $text = wpautop($text);
-
+ $text = wpautop( $text );
+
// return
return $text;
}
/**
-* acf_get_sites
-*
-* Returns an array of sites for a network.
-*
-* @date 29/08/2016
-* @since 5.4.0
-*
-* @param void
-* @return array
-*/
+ * acf_get_sites
+ *
+ * Returns an array of sites for a network.
+ *
+ * @date 29/08/2016
+ * @since 5.4.0
+ *
+ * @param void
+ * @return array
+ */
function acf_get_sites() {
$results = array();
- $sites = get_sites( array( 'number' => 0 ) );
- if( $sites ) {
- foreach( $sites as $site ) {
- $results[] = get_site( $site )->to_array();
- }
+ $sites = get_sites( array( 'number' => 0 ) );
+ if ( $sites ) {
+ foreach ( $sites as $site ) {
+ $results[] = get_site( $site )->to_array();
+ }
}
return $results;
}
/**
-* acf_convert_rules_to_groups
-*
-* Converts an array of rules from ACF4 to an array of groups for ACF5
-*
-* @date 25/8/18
-* @since 5.7.4
-*
-* @param array $rules An array of rules.
-* @param string $anyorall The anyorall setting used in ACF4. Defaults to 'any'.
-* @return array
-*/
+ * acf_convert_rules_to_groups
+ *
+ * Converts an array of rules from ACF4 to an array of groups for ACF5
+ *
+ * @date 25/8/18
+ * @since 5.7.4
+ *
+ * @param array $rules An array of rules.
+ * @param string $anyorall The anyorall setting used in ACF4. Defaults to 'any'.
+ * @return array
+ */
function acf_convert_rules_to_groups( $rules, $anyorall = 'any' ) {
-
+
// vars
$groups = array();
- $index = 0;
-
+ $index = 0;
+
// loop
- foreach( $rules as $rule ) {
-
+ foreach ( $rules as $rule ) {
+
// extract vars
$group = acf_extract_var( $rule, 'group_no' );
$order = acf_extract_var( $rule, 'order_no' );
-
+
// calculate group if not defined
- if( $group === null ) {
+ if ( $group === null ) {
$group = $index;
-
+
// use $anyorall to determine if a new group is needed
- if( $anyorall == 'any' ) {
+ if ( $anyorall == 'any' ) {
$index++;
}
}
-
+
// calculate order if not defined
- if( $order === null ) {
- $order = isset($groups[ $group ]) ? count($groups[ $group ]) : 0;
+ if ( $order === null ) {
+ $order = isset( $groups[ $group ] ) ? count( $groups[ $group ] ) : 0;
}
-
+
// append to group
$groups[ $group ][ $order ] = $rule;
-
+
// sort groups
ksort( $groups[ $group ] );
}
-
+
// sort groups
ksort( $groups );
-
+
// return
return $groups;
}
/**
-* acf_register_ajax
-*
-* Regsiters an ajax callback.
-*
-* @date 5/10/18
-* @since 5.7.7
-*
-* @param string $name The ajax action name.
-* @param array $callback The callback function or array.
-* @param bool $public Whether to allow access to non logged in users.
-* @return void
-*/
+ * acf_register_ajax
+ *
+ * Regsiters an ajax callback.
+ *
+ * @date 5/10/18
+ * @since 5.7.7
+ *
+ * @param string $name The ajax action name.
+ * @param array $callback The callback function or array.
+ * @param bool $public Whether to allow access to non logged in users.
+ * @return void
+ */
function acf_register_ajax( $name = '', $callback = false, $public = false ) {
-
+
// vars
$action = "acf/ajax/$name";
-
+
// add action for logged-in users
add_action( "wp_ajax_$action", $callback );
-
+
// add action for non logged-in users
- if( $public ) {
+ if ( $public ) {
add_action( "wp_ajax_nopriv_$action", $callback );
}
}
/**
-* acf_str_camel_case
-*
-* Converts a string into camelCase.
-* Thanks to https://stackoverflow.com/questions/31274782/convert-array-keys-from-underscore-case-to-camelcase-recursively
-*
-* @date 24/10/18
-* @since 5.8.0
-*
-* @param string $string The string ot convert.
-* @return string
-*/
+ * acf_str_camel_case
+ *
+ * Converts a string into camelCase.
+ * Thanks to https://stackoverflow.com/questions/31274782/convert-array-keys-from-underscore-case-to-camelcase-recursively
+ *
+ * @date 24/10/18
+ * @since 5.8.0
+ *
+ * @param string $string The string ot convert.
+ * @return string
+ */
function acf_str_camel_case( $string = '' ) {
- return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $string))));
+ return lcfirst( str_replace( ' ', '', ucwords( str_replace( '_', ' ', $string ) ) ) );
}
/**
-* acf_array_camel_case
-*
-* Converts all aray keys to camelCase.
-*
-* @date 24/10/18
-* @since 5.8.0
-*
-* @param array $array The array to convert.
-* @return array
-*/
+ * acf_array_camel_case
+ *
+ * Converts all aray keys to camelCase.
+ *
+ * @date 24/10/18
+ * @since 5.8.0
+ *
+ * @param array $array The array to convert.
+ * @return array
+ */
function acf_array_camel_case( $array = array() ) {
$array2 = array();
- foreach( $array as $k => $v ) {
- $array2[ acf_str_camel_case($k) ] = $v;
+ foreach ( $array as $k => $v ) {
+ $array2[ acf_str_camel_case( $k ) ] = $v;
}
return $array2;
}
@@ -4774,7 +4589,7 @@ function acf_array_camel_case( $array = array() ) {
function acf_is_block_editor() {
if ( function_exists( 'get_current_screen' ) ) {
$screen = get_current_screen();
- if( $screen && method_exists( $screen, 'is_block_editor' ) ) {
+ if ( $screen && method_exists( $screen, 'is_block_editor' ) ) {
return $screen->is_block_editor();
}
}
diff --git a/includes/api/api-template.php b/includes/api/api-template.php
index ad99e8a..01f4f94 100644
--- a/includes/api/api-template.php
+++ b/includes/api/api-template.php
@@ -1,64 +1,60 @@
- $selector,
- 'key' => '',
- 'type' => '',
- ));
-
-
+ if ( ! $field ) {
+
+ $field = acf_get_valid_field(
+ array(
+ 'name' => $selector,
+ 'key' => '',
+ 'type' => '',
+ )
+ );
+
// prevent formatting
$format_value = false;
-
+
}
-
-
+
// get value for field
$value = acf_get_value( $post_id, $field );
-
-
+
// format value
- if( $format_value ) {
-
+ if ( $format_value ) {
+
// get value for field
$value = acf_format_value( $value, $post_id, $field );
-
+
}
-
-
+
// return
return $value;
-
+
}
@@ -67,27 +63,27 @@ function get_field( $selector, $post_id = false, $format_value = true ) {
*
* This function is the same as echo get_field().
*
-* @type function
-* @since 1.0.3
-* @date 29/01/13
+* @type function
+* @since 1.0.3
+* @date 29/01/13
*
-* @param $selector (string) the field name or key
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return n/a
+* @param $selector (string) the field name or key
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return n/a
*/
function the_field( $selector, $post_id = false, $format_value = true ) {
-
- $value = get_field($selector, $post_id, $format_value);
-
- if( is_array($value) ) {
-
+
+ $value = get_field( $selector, $post_id, $format_value );
+
+ if ( is_array( $value ) ) {
+
$value = @implode( ', ', $value );
-
+
}
-
+
echo $value;
-
+
}
@@ -96,55 +92,53 @@ function the_field( $selector, $post_id = false, $format_value = true ) {
*
* This function will return an array containing all the field data for a given field_name
*
-* @type function
-* @since 3.6
-* @date 3/02/13
+* @type function
+* @since 3.6
+* @date 3/02/13
*
-* @param $selector (string) the field name or key
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @param $format_value (boolean) whether or not to format the field value
-* @param $load_value (boolean) whether or not to load the field value
-* @return $field (array)
+* @param $selector (string) the field name or key
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @param $format_value (boolean) whether or not to format the field value
+* @param $load_value (boolean) whether or not to load the field value
+* @return $field (array)
*/
function get_field_object( $selector, $post_id = false, $format_value = true, $load_value = true ) {
-
+
// compatibilty
- if( is_array($format_value) ) extract( $format_value );
-
-
+ if ( is_array( $format_value ) ) {
+ extract( $format_value );
+ }
+
// get valid post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field key
$field = acf_maybe_get_field( $selector, $post_id );
-
-
+
// bail early if no field found
- if( !$field ) return false;
-
-
- // load value
- if( $load_value ) {
-
- $field['value'] = acf_get_value( $post_id, $field );
-
+ if ( ! $field ) {
+ return false;
}
-
-
+
+ // load value
+ if ( $load_value ) {
+
+ $field['value'] = acf_get_value( $post_id, $field );
+
+ }
+
// format value
- if( $format_value ) {
-
+ if ( $format_value ) {
+
// get value for field
$field['value'] = acf_format_value( $field['value'], $post_id, $field );
-
+
}
-
-
+
// return
return $field;
-
+
}
/*
@@ -153,37 +147,37 @@ function get_field_object( $selector, $post_id = false, $format_value = true, $l
* This function will return a field for the given selector.
* It will also review the field_reference to ensure the correct field is returned which makes it useful for the template API
*
-* @type function
-* @date 4/08/2015
-* @since 5.2.3
+* @type function
+* @date 4/08/2015
+* @since 5.2.3
*
-* @param $selector (mixed) identifyer of field. Can be an ID, key, name or post object
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @param $strict (boolean) if true, return a field only when a field key is found.
-* @return $field (array)
+* @param $selector (mixed) identifyer of field. Can be an ID, key, name or post object
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @param $strict (boolean) if true, return a field only when a field key is found.
+* @return $field (array)
*/
function acf_maybe_get_field( $selector, $post_id = false, $strict = true ) {
-
+
// init
acf_init();
-
+
// Check if field key was given.
- if( acf_is_field_key($selector) ) {
+ if ( acf_is_field_key( $selector ) ) {
return acf_get_field( $selector );
}
-
+
// Lookup field via reference.
$post_id = acf_get_valid_post_id( $post_id );
- $field = acf_get_meta_field( $selector, $post_id );
- if( $field ) {
+ $field = acf_get_meta_field( $selector, $post_id );
+ if ( $field ) {
return $field;
}
-
+
// Lookup field loosely via name.
- if( !$strict ) {
- return acf_get_field( $selector );
+ if ( ! $strict ) {
+ return acf_get_field( $selector );
}
-
+
// Return no result.
return false;
}
@@ -193,57 +187,55 @@ function acf_maybe_get_field( $selector, $post_id = false, $strict = true ) {
*
* This function will attempt to find a sub field
*
-* @type function
-* @date 3/10/2016
-* @since 5.4.0
+* @type function
+* @date 3/10/2016
+* @since 5.4.0
*
-* @param $post_id (int)
-* @return $post_id (int)
+* @param $post_id (int)
+* @return $post_id (int)
*/
function acf_maybe_get_sub_field( $selectors, $post_id = false, $strict = true ) {
-
+
// bail ealry if not enough selectors
- if( !is_array($selectors) || count($selectors) < 3 ) return false;
-
-
+ if ( ! is_array( $selectors ) || count( $selectors ) < 3 ) {
+ return false;
+ }
+
// vars
- $offset = acf_get_setting('row_index_offset');
- $selector = acf_extract_var( $selectors, 0 );
+ $offset = acf_get_setting( 'row_index_offset' );
+ $selector = acf_extract_var( $selectors, 0 );
$selectors = array_values( $selectors ); // reset keys
-
-
+
// attempt get field
$field = acf_maybe_get_field( $selector, $post_id, $strict );
-
-
+
// bail early if no field
- if( !$field ) return false;
-
-
+ if ( ! $field ) {
+ return false;
+ }
+
// loop
- for( $j = 0; $j < count($selectors); $j+=2 ) {
-
+ for ( $j = 0; $j < count( $selectors ); $j += 2 ) {
+
// vars
- $sub_i = $selectors[ $j ];
- $sub_s = $selectors[ $j+1 ];
+ $sub_i = $selectors[ $j ];
+ $sub_s = $selectors[ $j + 1 ];
$field_name = $field['name'];
-
-
+
// find sub field
$field = acf_get_sub_field( $sub_s, $field );
-
-
+
// bail early if no sub field
- if( !$field ) return false;
-
-
+ if ( ! $field ) {
+ return false;
+ }
+
// add to name
- $field['name'] = $field_name . '_' . ($sub_i-$offset) . '_' . $field['name'];
-
+ $field['name'] = $field_name . '_' . ( $sub_i - $offset ) . '_' . $field['name'];
+
}
-
-
+
// return
return $field;
}
@@ -254,37 +246,36 @@ function acf_maybe_get_sub_field( $selectors, $post_id = false, $strict = true )
* This function will return an array containing all the custom field values for a specific post_id.
* The function is not very elegant and wastes a lot of PHP memory / SQL queries if you are not using all the values.
*
-* @type function
-* @since 3.6
-* @date 29/01/13
+* @type function
+* @since 3.6
+* @date 29/01/13
*
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @param $format_value (boolean) whether or not to format the field value
-* @return (array) associative array where field name => field value
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @param $format_value (boolean) whether or not to format the field value
+* @return (array) associative array where field name => field value
*/
function get_fields( $post_id = false, $format_value = true ) {
-
+
// vars
$fields = get_field_objects( $post_id, $format_value );
- $meta = array();
-
-
+ $meta = array();
+
// bail early
- if( !$fields ) return false;
-
-
- // populate
- foreach( $fields as $k => $field ) {
-
- $meta[ $k ] = $field['value'];
-
+ if ( ! $fields ) {
+ return false;
}
-
-
+
+ // populate
+ foreach ( $fields as $k => $field ) {
+
+ $meta[ $k ] = $field['value'];
+
+ }
+
// return
- return $meta;
-
+ return $meta;
+
}
@@ -294,61 +285,69 @@ function get_fields( $post_id = false, $format_value = true ) {
* This function will return an array containing all the custom field objects for a specific post_id.
* The function is not very elegant and wastes a lot of PHP memory / SQL queries if you are not using all the fields / values.
*
-* @type function
-* @since 3.6
-* @date 29/01/13
+* @type function
+* @since 3.6
+* @date 29/01/13
*
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @param $format_value (boolean) whether or not to format the field value
-* @param $load_value (boolean) whether or not to load the field value
-* @return (array) associative array where field name => field
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @param $format_value (boolean) whether or not to format the field value
+* @param $load_value (boolean) whether or not to load the field value
+* @return (array) associative array where field name => field
*/
function get_field_objects( $post_id = false, $format_value = true, $load_value = true ) {
-
+
// init
acf_init();
-
+
// validate post_id
$post_id = acf_get_valid_post_id( $post_id );
-
+
// get meta
$meta = acf_get_meta( $post_id );
-
+
// bail early if no meta
- if( empty($meta) ) return false;
-
+ if ( empty( $meta ) ) {
+ return false;
+ }
+
// populate vars
$fields = array();
- foreach( $meta as $key => $value ) {
-
+ foreach ( $meta as $key => $value ) {
+
// bail if reference key does not exist
- if( !isset($meta["_$key"]) ) continue;
-
+ if ( ! isset( $meta[ "_$key" ] ) ) {
+ continue;
+ }
+
// get field
- $field = acf_get_field($meta["_$key"]);
-
+ $field = acf_get_field( $meta[ "_$key" ] );
+
// bail early if no field, or if the field's name is different to $key
// - solves problem where sub fields (and clone fields) are incorrectly allowed
- if( !$field || $field['name'] !== $key ) continue;
-
+ if ( ! $field || $field['name'] !== $key ) {
+ continue;
+ }
+
// load value
- if( $load_value ) {
+ if ( $load_value ) {
$field['value'] = acf_get_value( $post_id, $field );
}
-
+
// format value
- if( $format_value ) {
+ if ( $format_value ) {
$field['value'] = acf_format_value( $field['value'], $post_id, $field );
}
-
+
// append to $value
$fields[ $key ] = $field;
}
-
+
// no value
- if( empty($fields) ) return false;
-
+ if ( empty( $fields ) ) {
+ return false;
+ }
+
// return
return $fields;
}
@@ -360,133 +359,133 @@ function get_field_objects( $post_id = false, $format_value = true, $load_value
* Checks if a field (such as Repeater or Flexible Content) has any rows of data to loop over.
* This function is intended to be used in conjunction with the_row() to step through available values.
*
- * @date 2/09/13
- * @since 4.3.0
+ * @date 2/09/13
+ * @since 4.3.0
*
- * @param string $selector The field name or field key.
- * @param mixed $post_id The post ID where the value is saved. Defaults to the current post.
- * @return bool
+ * @param string $selector The field name or field key.
+ * @param mixed $post_id The post ID where the value is saved. Defaults to the current post.
+ * @return bool
*/
function have_rows( $selector, $post_id = false ) {
-
+
// Validate and backup $post_id.
$_post_id = $post_id;
- $post_id = acf_get_valid_post_id( $post_id );
-
+ $post_id = acf_get_valid_post_id( $post_id );
+
// Vars.
- $key = "selector={$selector}/post_id={$post_id}";
- $active_loop = acf_get_loop('active');
- $prev_loop = acf_get_loop('previous');
- $new_loop = false;
- $sub_field = false;
-
+ $key = "selector={$selector}/post_id={$post_id}";
+ $active_loop = acf_get_loop( 'active' );
+ $prev_loop = acf_get_loop( 'previous' );
+ $new_loop = false;
+ $sub_field = false;
+
// Check if no active loop.
- if( !$active_loop ) {
+ if ( ! $active_loop ) {
$new_loop = 'parent';
-
- // Detect "change" compared to the active loop.
- } elseif( $key !== $active_loop['key'] ) {
-
+
+ // Detect "change" compared to the active loop.
+ } elseif ( $key !== $active_loop['key'] ) {
+
// Find sub field and check if a sub value exists.
$sub_field_exists = false;
- $sub_field = acf_get_sub_field($selector, $active_loop['field']);
- if( $sub_field ) {
+ $sub_field = acf_get_sub_field( $selector, $active_loop['field'] );
+ if ( $sub_field ) {
$sub_field_exists = isset( $active_loop['value'][ $active_loop['i'] ][ $sub_field['key'] ] );
}
-
+
// Detect change in post_id.
- if( $post_id != $active_loop['post_id'] ) {
-
+ if ( $post_id != $active_loop['post_id'] ) {
+
// Case: Change in $post_id was due to this being a nested loop and not specifying the $post_id.
// Action: Move down one level into a new loop.
- if( empty($_post_id) && $sub_field_exists ) {
+ if ( empty( $_post_id ) && $sub_field_exists ) {
$new_loop = 'child';
-
- // Case: Change in $post_id was due to a nested loop ending.
- // Action: move up one level through the loops.
- } elseif( $prev_loop && $prev_loop['post_id'] == $post_id ) {
- acf_remove_loop('active');
+
+ // Case: Change in $post_id was due to a nested loop ending.
+ // Action: move up one level through the loops.
+ } elseif ( $prev_loop && $prev_loop['post_id'] == $post_id ) {
+ acf_remove_loop( 'active' );
$active_loop = $prev_loop;
-
- // Case: Chang in $post_id is the most obvious, used in an WP_Query loop with multiple $post objects.
- // Action: leave this current loop alone and create a new parent loop.
+
+ // Case: Chang in $post_id is the most obvious, used in an WP_Query loop with multiple $post objects.
+ // Action: leave this current loop alone and create a new parent loop.
} else {
$new_loop = 'parent';
}
-
- // Detect change in selector.
- } elseif( $selector != $active_loop['selector'] ) {
-
+
+ // Detect change in selector.
+ } elseif ( $selector != $active_loop['selector'] ) {
+
// Case: Change in $field_name was due to this being a nested loop.
// Action: move down one level into a new loop.
- if( $sub_field_exists ) {
+ if ( $sub_field_exists ) {
$new_loop = 'child';
-
- // Case: Change in $field_name was due to a nested loop ending.
- // Action: move up one level through the loops.
- } elseif( $prev_loop && $prev_loop['selector'] == $selector && $prev_loop['post_id'] == $post_id ) {
- acf_remove_loop('active');
+
+ // Case: Change in $field_name was due to a nested loop ending.
+ // Action: move up one level through the loops.
+ } elseif ( $prev_loop && $prev_loop['selector'] == $selector && $prev_loop['post_id'] == $post_id ) {
+ acf_remove_loop( 'active' );
$active_loop = $prev_loop;
-
- // Case: Change in $field_name is the most obvious, this is a new loop for a different field within the $post.
- // Action: leave this current loop alone and create a new parent loop.
+
+ // Case: Change in $field_name is the most obvious, this is a new loop for a different field within the $post.
+ // Action: leave this current loop alone and create a new parent loop.
} else {
$new_loop = 'parent';
}
}
}
-
+
// Add loop if required.
- if( $new_loop ) {
+ if ( $new_loop ) {
$args = array(
- 'key' => $key,
- 'selector' => $selector,
- 'post_id' => $post_id,
- 'name' => null,
- 'value' => null,
- 'field' => null,
- 'i' => -1,
+ 'key' => $key,
+ 'selector' => $selector,
+ 'post_id' => $post_id,
+ 'name' => null,
+ 'value' => null,
+ 'field' => null,
+ 'i' => -1,
);
-
+
// Case: Parent loop.
- if( $new_loop === 'parent' ) {
+ if ( $new_loop === 'parent' ) {
$field = get_field_object( $selector, $post_id, false );
- if( $field ) {
+ if ( $field ) {
$args['field'] = $field;
$args['value'] = $field['value'];
- $args['name'] = $field['name'];
+ $args['name'] = $field['name'];
unset( $args['field']['value'] );
}
-
- // Case: Child loop ($sub_field must exist).
+
+ // Case: Child loop ($sub_field must exist).
} else {
- $args['field'] = $sub_field;
- $args['value'] = $active_loop['value'][ $active_loop['i'] ][ $sub_field['key'] ];
- $args['name'] = "{$active_loop['name']}_{$active_loop['i']}_{$sub_field['name']}";
+ $args['field'] = $sub_field;
+ $args['value'] = $active_loop['value'][ $active_loop['i'] ][ $sub_field['key'] ];
+ $args['name'] = "{$active_loop['name']}_{$active_loop['i']}_{$sub_field['name']}";
$args['post_id'] = $active_loop['post_id'];
}
-
+
// Bail early if value is either empty or a non array.
- if( !$args['value'] || !is_array($args['value']) ) {
+ if ( ! $args['value'] || ! is_array( $args['value'] ) ) {
return false;
}
-
+
// Allow for non repeatable data for Group and Clone fields.
- if( acf_get_field_type_prop($args['field']['type'], 'have_rows') === 'single' ) {
+ if ( acf_get_field_type_prop( $args['field']['type'], 'have_rows' ) === 'single' ) {
$args['value'] = array( $args['value'] );
}
-
+
// Add loop.
- $active_loop = acf_add_loop($args);
+ $active_loop = acf_add_loop( $args );
}
-
+
// Return true if next row exists.
- if( $active_loop && isset($active_loop['value'][ $active_loop['i']+1 ]) ) {
+ if ( $active_loop && isset( $active_loop['value'][ $active_loop['i'] + 1 ] ) ) {
return true;
- }
-
+ }
+
// Return false if no next row.
- acf_remove_loop('active');
+ acf_remove_loop( 'active' );
return false;
}
@@ -496,100 +495,93 @@ function have_rows( $selector, $post_id = false ) {
*
* This function will progress the global repeater or flexible content value 1 row
*
-* @type function
-* @date 2/09/13
-* @since 4.3.0
+* @type function
+* @date 2/09/13
+* @since 4.3.0
*
-* @param N/A
-* @return (array) the current row data
+* @param N/A
+* @return (array) the current row data
*/
function the_row( $format = false ) {
-
+
// vars
- $i = acf_get_loop('active', 'i');
-
-
+ $i = acf_get_loop( 'active', 'i' );
+
// increase
$i++;
-
-
+
// update
- acf_update_loop('active', 'i', $i);
-
-
+ acf_update_loop( 'active', 'i', $i );
+
// return
return get_row( $format );
-
+
}
function get_row( $format = false ) {
-
+
// vars
- $loop = acf_get_loop('active');
-
-
+ $loop = acf_get_loop( 'active' );
+
// bail early if no loop
- if( !$loop ) return false;
-
-
+ if ( ! $loop ) {
+ return false;
+ }
+
// get value
$value = acf_maybe_get( $loop['value'], $loop['i'] );
-
-
+
// bail early if no current value
// possible if get_row_layout() is called before the_row()
- if( !$value ) return false;
-
-
+ if ( ! $value ) {
+ return false;
+ }
+
// format
- if( $format ) {
-
+ if ( $format ) {
+
// vars
$field = $loop['field'];
-
-
+
// single row
- if( acf_get_field_type_prop($field['type'], 'have_rows') === 'single' ) {
-
+ if ( acf_get_field_type_prop( $field['type'], 'have_rows' ) === 'single' ) {
+
// format value
$value = acf_format_value( $value, $loop['post_id'], $field );
-
- // multiple rows
+
+ // multiple rows
} else {
-
+
// format entire value
// - solves problem where cached value is incomplete
// - no performance issues here thanks to cache
$value = acf_format_value( $loop['value'], $loop['post_id'], $field );
$value = acf_maybe_get( $value, $loop['i'] );
-
+
}
-
}
-
-
+
// return
return $value;
-
+
}
function get_row_index() {
-
+
// vars
- $i = acf_get_loop('active', 'i');
- $offset = acf_get_setting('row_index_offset');
-
-
+ $i = acf_get_loop( 'active', 'i' );
+ $offset = acf_get_setting( 'row_index_offset' );
+
// return
return $offset + $i;
-
+
}
function the_row_index() {
-
+
echo get_row_index();
-
+
}
@@ -598,39 +590,38 @@ function the_row_index() {
*
* This function is used inside a 'has_sub_field' while loop to return a sub field object
*
-* @type function
-* @date 16/05/2016
-* @since 5.3.8
+* @type function
+* @date 16/05/2016
+* @since 5.3.8
*
-* @param $selector (string)
-* @return (array)
+* @param $selector (string)
+* @return (array)
*/
function get_row_sub_field( $selector ) {
-
+
// vars
- $row = acf_get_loop('active');
-
-
+ $row = acf_get_loop( 'active' );
+
// bail early if no row
- if( !$row ) return false;
-
-
+ if ( ! $row ) {
+ return false;
+ }
+
// attempt to find sub field
- $sub_field = acf_get_sub_field($selector, $row['field']);
-
-
+ $sub_field = acf_get_sub_field( $selector, $row['field'] );
+
// bail early if no field
- if( !$sub_field ) return false;
-
-
+ if ( ! $sub_field ) {
+ return false;
+ }
+
// update field's name based on row data
$sub_field['name'] = "{$row['name']}_{$row['i']}_{$sub_field['name']}";
-
-
+
// return
return $sub_field;
-
+
}
@@ -639,35 +630,34 @@ function get_row_sub_field( $selector ) {
*
* This function is used inside a 'has_sub_field' while loop to return a sub field value
*
-* @type function
-* @date 16/05/2016
-* @since 5.3.8
+* @type function
+* @date 16/05/2016
+* @since 5.3.8
*
-* @param $selector (string)
-* @return (mixed)
+* @param $selector (string)
+* @return (mixed)
*/
function get_row_sub_value( $selector ) {
-
+
// vars
- $row = acf_get_loop('active');
-
-
+ $row = acf_get_loop( 'active' );
+
// bail early if no row
- if( !$row ) return null;
-
-
- // return value
- if( isset($row['value'][ $row['i'] ][ $selector ]) ) {
-
- return $row['value'][ $row['i'] ][ $selector ];
-
+ if ( ! $row ) {
+ return null;
}
-
-
+
+ // return value
+ if ( isset( $row['value'][ $row['i'] ][ $selector ] ) ) {
+
+ return $row['value'][ $row['i'] ][ $selector ];
+
+ }
+
// return
return null;
-
+
}
@@ -677,23 +667,22 @@ function get_row_sub_value( $selector ) {
* This function will find the current loop and unset it from the global array.
* To bo used when loop finishes or a break is used
*
-* @type function
-* @date 26/10/13
-* @since 5.0.0
+* @type function
+* @date 26/10/13
+* @since 5.0.0
*
-* @param $hard_reset (boolean) completely wipe the global variable, or just unset the active row
-* @return (boolean)
+* @param $hard_reset (boolean) completely wipe the global variable, or just unset the active row
+* @return (boolean)
*/
function reset_rows() {
-
+
// remove last loop
- acf_remove_loop('active');
-
-
+ acf_remove_loop( 'active' );
+
// return
return true;
-
+
}
@@ -701,41 +690,39 @@ function reset_rows() {
* has_sub_field()
*
* This function is used inside a while loop to return either true or false (loop again or stop).
-* When using a repeater or flexible content field, it will loop through the rows until
+* When using a repeater or flexible content field, it will loop through the rows until
* there are none left or a break is detected
*
-* @type function
-* @since 1.0.3
-* @date 29/01/13
+* @type function
+* @since 1.0.3
+* @date 29/01/13
*
-* @param $field_name (string) the field name
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return (boolean)
+* @param $field_name (string) the field name
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return (boolean)
*/
function has_sub_field( $field_name, $post_id = false ) {
-
+
// vars
$r = have_rows( $field_name, $post_id );
-
-
+
// if has rows, progress through 1 row for the while loop to work
- if( $r ) {
-
+ if ( $r ) {
+
the_row();
-
+
}
-
-
+
// return
return $r;
-
+
}
function has_sub_fields( $field_name, $post_id = false ) {
-
+
return has_sub_field( $field_name, $post_id );
-
+
}
@@ -744,27 +731,27 @@ function has_sub_fields( $field_name, $post_id = false ) {
*
* This function is used inside a 'has_sub_field' while loop to return a sub field value
*
-* @type function
-* @since 1.0.3
-* @date 29/01/13
+* @type function
+* @since 1.0.3
+* @date 29/01/13
*
-* @param $field_name (string) the field name
-* @return (mixed)
+* @param $field_name (string) the field name
+* @return (mixed)
*/
function get_sub_field( $selector = '', $format_value = true ) {
-
+
// get sub field
$sub_field = get_sub_field_object( $selector, $format_value );
-
-
+
// bail early if no sub field
- if( !$sub_field ) return false;
-
-
- // return
+ if ( ! $sub_field ) {
+ return false;
+ }
+
+ // return
return $sub_field['value'];
-
+
}
@@ -773,24 +760,24 @@ function get_sub_field( $selector = '', $format_value = true ) {
*
* This function is the same as echo get_sub_field
*
-* @type function
-* @since 1.0.3
-* @date 29/01/13
+* @type function
+* @since 1.0.3
+* @date 29/01/13
*
-* @param $field_name (string) the field name
-* @return n/a
+* @param $field_name (string) the field name
+* @return n/a
*/
function the_sub_field( $field_name, $format_value = true ) {
-
+
$value = get_sub_field( $field_name, $format_value );
-
- if( is_array($value) ) {
-
- $value = implode(', ',$value);
-
+
+ if ( is_array( $value ) ) {
+
+ $value = implode( ', ', $value );
+
}
-
+
echo $value;
}
@@ -800,52 +787,50 @@ function the_sub_field( $field_name, $format_value = true ) {
*
* This function is used inside a 'has_sub_field' while loop to return a sub field object
*
-* @type function
-* @since 3.5.8.1
-* @date 29/01/13
+* @type function
+* @since 3.5.8.1
+* @date 29/01/13
*
-* @param $child_name (string) the field name
-* @return (array)
+* @param $child_name (string) the field name
+* @return (array)
*/
function get_sub_field_object( $selector, $format_value = true, $load_value = true ) {
-
+
// vars
- $row = acf_get_loop('active');
-
-
+ $row = acf_get_loop( 'active' );
+
// bail early if no row
- if( !$row ) return false;
-
-
- // attempt to find sub field
- $sub_field = get_row_sub_field($selector);
-
-
- // bail early if no sub field
- if( !$sub_field ) return false;
-
-
- // load value
- if( $load_value ) {
-
- $sub_field['value'] = get_row_sub_value( $sub_field['key'] );
-
+ if ( ! $row ) {
+ return false;
}
-
-
+
+ // attempt to find sub field
+ $sub_field = get_row_sub_field( $selector );
+
+ // bail early if no sub field
+ if ( ! $sub_field ) {
+ return false;
+ }
+
+ // load value
+ if ( $load_value ) {
+
+ $sub_field['value'] = get_row_sub_value( $sub_field['key'] );
+
+ }
+
// format value
- if( $format_value ) {
-
+ if ( $format_value ) {
+
// get value for field
$sub_field['value'] = acf_format_value( $sub_field['value'], $row['post_id'], $sub_field );
-
+
}
-
-
+
// return
return $sub_field;
-
+
}
@@ -854,31 +839,29 @@ function get_sub_field_object( $selector, $format_value = true, $load_value = tr
*
* This function will return a string representation of the current row layout within a 'have_rows' loop
*
-* @type function
-* @since 3.0.6
-* @date 29/01/13
+* @type function
+* @since 3.0.6
+* @date 29/01/13
*
-* @param n/a
-* @return (string)
+* @param n/a
+* @return (string)
*/
function get_row_layout() {
-
+
// vars
$row = get_row();
-
-
+
// return
- if( isset($row['acf_fc_layout']) ) {
-
+ if ( isset( $row['acf_fc_layout'] ) ) {
+
return $row['acf_fc_layout'];
-
+
}
-
-
+
// return
return false;
-
+
}
@@ -888,44 +871,50 @@ function get_row_layout() {
* This function is used to add basic shortcode support for the ACF plugin
* eg. [acf field="heading" post_id="123" format_value="1"]
*
-* @type function
-* @since 1.1.1
-* @date 29/01/13
+* @type function
+* @since 1.1.1
+* @date 29/01/13
*
-* @param $field (string) the field name or key
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @param $format_value (boolean) whether or not to format the field value
-* @return (string)
+* @param $field (string) the field name or key
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @param $format_value (boolean) whether or not to format the field value
+* @return (string)
*/
function acf_shortcode( $atts ) {
-
+ // Mitigate issue where some AJAX requests can return ACF field data.
+ if ( wp_doing_ajax() && ! current_user_can( 'edit_posts' ) ) {
+ return;
+ }
+
// extract attributs
- extract( shortcode_atts( array(
- 'field' => '',
- 'post_id' => false,
- 'format_value' => true
- ), $atts ) );
-
-
+ extract(
+ shortcode_atts(
+ array(
+ 'field' => '',
+ 'post_id' => false,
+ 'format_value' => true,
+ ),
+ $atts
+ )
+ );
+
// get value and return it
$value = get_field( $field, $post_id, $format_value );
-
-
+
// array
- if( is_array($value) ) {
-
+ if ( is_array( $value ) ) {
+
$value = @implode( ', ', $value );
-
+
}
-
-
+
// return
return $value;
-
+
}
-add_shortcode('acf', 'acf_shortcode');
+add_shortcode( 'acf', 'acf_shortcode' );
/*
@@ -933,41 +922,40 @@ add_shortcode('acf', 'acf_shortcode');
*
* This function will update a value in the database
*
-* @type function
-* @since 3.1.9
-* @date 29/01/13
+* @type function
+* @since 3.1.9
+* @date 29/01/13
*
-* @param $selector (string) the field name or key
-* @param $value (mixed) the value to save in the database
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return (boolean)
+* @param $selector (string) the field name or key
+* @param $value (mixed) the value to save in the database
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return (boolean)
*/
function update_field( $selector, $value, $post_id = false ) {
-
+
// filter post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field
$field = acf_maybe_get_field( $selector, $post_id, false );
-
-
+
// create dummy field
- if( !$field ) {
-
- $field = acf_get_valid_field(array(
- 'name' => $selector,
- 'key' => '',
- 'type' => '',
- ));
-
+ if ( ! $field ) {
+
+ $field = acf_get_valid_field(
+ array(
+ 'name' => $selector,
+ 'key' => '',
+ 'type' => '',
+ )
+ );
+
}
-
-
+
// save
return acf_update_value( $value, $post_id, $field );
-
+
}
@@ -976,43 +964,42 @@ function update_field( $selector, $value, $post_id = false ) {
*
* This function will update a value of a sub field in the database
*
-* @type function
-* @date 2/04/2014
-* @since 5.0.0
+* @type function
+* @date 2/04/2014
+* @since 5.0.0
*
-* @param $selector (mixed) the sub field name or key, or an array of ancestors
-* @param $value (mixed) the value to save in the database
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return (boolean)
+* @param $selector (mixed) the sub field name or key, or an array of ancestors
+* @param $value (mixed) the value to save in the database
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return (boolean)
*/
function update_sub_field( $selector, $value, $post_id = false ) {
-
+
// vars
$sub_field = false;
-
-
- // get sub field
- if( is_array($selector) ) {
-
- $post_id = acf_get_valid_post_id( $post_id );
- $sub_field = acf_maybe_get_sub_field( $selector, $post_id, false );
-
- } else {
-
- $post_id = acf_get_loop('active', 'post_id');
- $sub_field = get_row_sub_field( $selector );
-
- }
-
-
- // bail early if no sub field
- if( !$sub_field ) return false;
+ // get sub field
+ if ( is_array( $selector ) ) {
+
+ $post_id = acf_get_valid_post_id( $post_id );
+ $sub_field = acf_maybe_get_sub_field( $selector, $post_id, false );
+
+ } else {
+
+ $post_id = acf_get_loop( 'active', 'post_id' );
+ $sub_field = get_row_sub_field( $selector );
+
+ }
+
+ // bail early if no sub field
+ if ( ! $sub_field ) {
+ return false;
+ }
// update
return acf_update_value( $value, $post_id, $sub_field );
-
+
}
@@ -1021,28 +1008,26 @@ function update_sub_field( $selector, $value, $post_id = false ) {
*
* This function will remove a value from the database
*
-* @type function
-* @since 3.1.9
-* @date 29/01/13
+* @type function
+* @since 3.1.9
+* @date 29/01/13
*
-* @param $selector (string) the field name or key
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return (boolean)
+* @param $selector (string) the field name or key
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return (boolean)
*/
function delete_field( $selector, $post_id = false ) {
-
+
// filter post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field
$field = acf_maybe_get_field( $selector, $post_id );
-
-
+
// delete
return $field ? acf_delete_value( $post_id, $field ) : false;
-
+
}
@@ -1051,20 +1036,20 @@ function delete_field( $selector, $post_id = false ) {
*
* This function will delete a value of a sub field in the database
*
-* @type function
-* @date 2/04/2014
-* @since 5.0.0
+* @type function
+* @date 2/04/2014
+* @since 5.0.0
*
-* @param $selector (mixed) the sub field name or key, or an array of ancestors
-* @param $value (mixed) the value to save in the database
-* @param $post_id (mixed) the post_id of which the value is saved against
-* @return (boolean)
+* @param $selector (mixed) the sub field name or key, or an array of ancestors
+* @param $value (mixed) the value to save in the database
+* @param $post_id (mixed) the post_id of which the value is saved against
+* @return (boolean)
*/
function delete_sub_field( $selector, $post_id = false ) {
-
+
return update_sub_field( $selector, null, $post_id );
-
+
}
@@ -1073,49 +1058,44 @@ function delete_sub_field( $selector, $post_id = false ) {
*
* This function will add a row of data to a field
*
-* @type function
-* @date 16/10/2015
-* @since 5.2.3
+* @type function
+* @date 16/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $row (array)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $row (array)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function add_row( $selector, $row = false, $post_id = false ) {
-
+
// filter post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field
$field = acf_maybe_get_field( $selector, $post_id, false );
-
-
+
// bail early if no field
- if( !$field ) return false;
-
-
+ if ( ! $field ) {
+ return false;
+ }
+
// get raw value
$value = acf_get_value( $post_id, $field );
-
-
+
// ensure array
- $value = acf_get_array($value);
-
-
+ $value = acf_get_array( $value );
+
// append
$value[] = $row;
-
-
+
// update value
acf_update_value( $value, $post_id, $field );
-
-
+
// return
- return count($value);
-
+ return count( $value );
+
}
@@ -1124,59 +1104,54 @@ function add_row( $selector, $row = false, $post_id = false ) {
*
* This function will add a row of data to a field
*
-* @type function
-* @date 16/10/2015
-* @since 5.2.3
+* @type function
+* @date 16/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $row (array)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $row (array)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function add_sub_row( $selector, $row = false, $post_id = false ) {
-
+
// vars
$sub_field = false;
-
-
+
// get sub field
- if( is_array($selector) ) {
-
- $post_id = acf_get_valid_post_id( $post_id );
+ if ( is_array( $selector ) ) {
+
+ $post_id = acf_get_valid_post_id( $post_id );
$sub_field = acf_maybe_get_sub_field( $selector, $post_id, false );
-
+
} else {
-
- $post_id = acf_get_loop('active', 'post_id');
+
+ $post_id = acf_get_loop( 'active', 'post_id' );
$sub_field = get_row_sub_field( $selector );
-
+
}
-
-
+
// bail early if no sub field
- if( !$sub_field ) return false;
-
-
+ if ( ! $sub_field ) {
+ return false;
+ }
+
// get raw value
$value = acf_get_value( $post_id, $sub_field );
-
-
+
// ensure array
$value = acf_get_array( $value );
-
-
+
// append
$value[] = $row;
-
// update
acf_update_value( $value, $post_id, $sub_field );
-
-
+
// return
- return count($value);
-
+ return count( $value );
+
}
@@ -1185,55 +1160,49 @@ function add_sub_row( $selector, $row = false, $post_id = false ) {
*
* This function will update a row of data to a field
*
-* @type function
-* @date 19/10/2015
-* @since 5.2.3
+* @type function
+* @date 19/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $i (int)
-* @param $row (array)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $i (int)
+* @param $row (array)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function update_row( $selector, $i = 1, $row = false, $post_id = false ) {
-
+
// vars
- $offset = acf_get_setting('row_index_offset');
- $i = $i - $offset;
-
-
+ $offset = acf_get_setting( 'row_index_offset' );
+ $i = $i - $offset;
+
// filter post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field
$field = acf_maybe_get_field( $selector, $post_id, false );
-
-
+
// bail early if no field
- if( !$field ) return false;
-
-
+ if ( ! $field ) {
+ return false;
+ }
+
// get raw value
$value = acf_get_value( $post_id, $field );
-
-
+
// ensure array
- $value = acf_get_array($value);
-
-
+ $value = acf_get_array( $value );
+
// update
$value[ $i ] = $row;
-
-
+
// update value
acf_update_value( $value, $post_id, $field );
-
-
+
// return
return true;
-
+
}
@@ -1242,61 +1211,56 @@ function update_row( $selector, $i = 1, $row = false, $post_id = false ) {
*
* This function will add a row of data to a field
*
-* @type function
-* @date 16/10/2015
-* @since 5.2.3
+* @type function
+* @date 16/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $row (array)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $row (array)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function update_sub_row( $selector, $i = 1, $row = false, $post_id = false ) {
-
+
// vars
$sub_field = false;
- $offset = acf_get_setting('row_index_offset');
- $i = $i - $offset;
-
-
+ $offset = acf_get_setting( 'row_index_offset' );
+ $i = $i - $offset;
+
// get sub field
- if( is_array($selector) ) {
-
- $post_id = acf_get_valid_post_id( $post_id );
+ if ( is_array( $selector ) ) {
+
+ $post_id = acf_get_valid_post_id( $post_id );
$sub_field = acf_maybe_get_sub_field( $selector, $post_id, false );
-
+
} else {
-
- $post_id = acf_get_loop('active', 'post_id');
+
+ $post_id = acf_get_loop( 'active', 'post_id' );
$sub_field = get_row_sub_field( $selector );
-
+
}
-
-
+
// bail early if no sub field
- if( !$sub_field ) return false;
-
-
+ if ( ! $sub_field ) {
+ return false;
+ }
+
// get raw value
$value = acf_get_value( $post_id, $sub_field );
-
-
+
// ensure array
$value = acf_get_array( $value );
-
-
+
// append
$value[ $i ] = $row;
-
// update
acf_update_value( $value, $post_id, $sub_field );
-
-
+
// return
return true;
-
+
}
@@ -1305,58 +1269,53 @@ function update_sub_row( $selector, $i = 1, $row = false, $post_id = false ) {
*
* This function will delete a row of data from a field
*
-* @type function
-* @date 19/10/2015
-* @since 5.2.3
+* @type function
+* @date 19/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $i (int)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $i (int)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function delete_row( $selector, $i = 1, $post_id = false ) {
-
+
// vars
- $offset = acf_get_setting('row_index_offset');
- $i = $i - $offset;
-
-
+ $offset = acf_get_setting( 'row_index_offset' );
+ $i = $i - $offset;
+
// filter post_id
$post_id = acf_get_valid_post_id( $post_id );
-
-
+
// get field
$field = acf_maybe_get_field( $selector, $post_id );
-
-
+
// bail early if no field
- if( !$field ) return false;
-
-
+ if ( ! $field ) {
+ return false;
+ }
+
// get value
$value = acf_get_value( $post_id, $field );
-
-
+
// ensure array
- $value = acf_get_array($value);
-
-
+ $value = acf_get_array( $value );
+
// bail early if index doesn't exist
- if( !isset($value[ $i ]) ) return false;
-
-
+ if ( ! isset( $value[ $i ] ) ) {
+ return false;
+ }
+
// unset
unset( $value[ $i ] );
-
-
+
// update
acf_update_value( $value, $post_id, $field );
-
-
+
// return
return true;
-
+
}
@@ -1365,65 +1324,61 @@ function delete_row( $selector, $i = 1, $post_id = false ) {
*
* This function will add a row of data to a field
*
-* @type function
-* @date 16/10/2015
-* @since 5.2.3
+* @type function
+* @date 16/10/2015
+* @since 5.2.3
*
-* @param $selector (string)
-* @param $row (array)
-* @param $post_id (mixed)
-* @return (boolean)
+* @param $selector (string)
+* @param $row (array)
+* @param $post_id (mixed)
+* @return (boolean)
*/
function delete_sub_row( $selector, $i = 1, $post_id = false ) {
-
+
// vars
$sub_field = false;
- $offset = acf_get_setting('row_index_offset');
- $i = $i - $offset;
-
-
+ $offset = acf_get_setting( 'row_index_offset' );
+ $i = $i - $offset;
+
// get sub field
- if( is_array($selector) ) {
-
- $post_id = acf_get_valid_post_id( $post_id );
+ if ( is_array( $selector ) ) {
+
+ $post_id = acf_get_valid_post_id( $post_id );
$sub_field = acf_maybe_get_sub_field( $selector, $post_id, false );
-
+
} else {
-
- $post_id = acf_get_loop('active', 'post_id');
+
+ $post_id = acf_get_loop( 'active', 'post_id' );
$sub_field = get_row_sub_field( $selector );
-
+
}
-
-
+
// bail early if no sub field
- if( !$sub_field ) return false;
-
-
+ if ( ! $sub_field ) {
+ return false;
+ }
+
// get raw value
$value = acf_get_value( $post_id, $sub_field );
-
-
+
// ensure array
$value = acf_get_array( $value );
-
-
+
// bail early if index doesn't exist
- if( !isset($value[ $i ]) ) return false;
-
-
+ if ( ! isset( $value[ $i ] ) ) {
+ return false;
+ }
+
// append
unset( $value[ $i ] );
-
// update
acf_update_value( $value, $post_id, $sub_field );
-
-
+
// return
return true;
-
+
}
@@ -1432,48 +1387,48 @@ function delete_sub_row( $selector, $i = 1, $post_id = false ) {
*
* These functions are outdated
*
-* @type function
-* @date 4/03/2014
-* @since 1.0.0
+* @type function
+* @date 4/03/2014
+* @since 1.0.0
*
-* @param n/a
-* @return n/a
+* @param n/a
+* @return n/a
*/
function create_field( $field ) {
acf_render_field( $field );
-
+
}
function render_field( $field ) {
acf_render_field( $field );
-
+
}
function reset_the_repeater_field() {
-
+
return reset_rows();
-
+
}
function the_repeater_field( $field_name, $post_id = false ) {
-
+
return has_sub_field( $field_name, $post_id );
-
+
}
function the_flexible_field( $field_name, $post_id = false ) {
-
+
return has_sub_field( $field_name, $post_id );
-
+
}
function acf_filter_post_id( $post_id ) {
-
+
return acf_get_valid_post_id( $post_id );
-
+
}
-?>
+
diff --git a/includes/api/api-term.php b/includes/api/api-term.php
index 6376b44..5cde29e 100644
--- a/includes/api/api-term.php
+++ b/includes/api/api-term.php
@@ -5,71 +5,73 @@
*
* Returns an array of taxonomy names.
*
-* @date 7/10/13
-* @since 5.0.0
+* @date 7/10/13
+* @since 5.0.0
*
-* @param array $args An array of args used in the get_taxonomies() function.
-* @return array An array of taxonomy names.
+* @param array $args An array of args used in the get_taxonomies() function.
+* @return array An array of taxonomy names.
*/
function acf_get_taxonomies( $args = array() ) {
// vars
$taxonomies = array();
-
+
// get taxonomy objects
$objects = get_taxonomies( $args, 'objects' );
-
+
// loop
- foreach( $objects as $i => $object ) {
-
+ foreach ( $objects as $i => $object ) {
+
// bail early if is builtin (WP) private post type
// - nav_menu_item, revision, customize_changeset, etc
- if( $object->_builtin && !$object->public ) continue;
-
+ if ( $object->_builtin && ! $object->public ) {
+ continue;
+ }
+
// append
$taxonomies[] = $i;
}
-
+
// custom post_type arg which does not yet exist in core
- if( isset($args['post_type']) ) {
- $taxonomies = acf_get_taxonomies_for_post_type($args['post_type']);
+ if ( isset( $args['post_type'] ) ) {
+ $taxonomies = acf_get_taxonomies_for_post_type( $args['post_type'] );
}
-
+
// filter
- $taxonomies = apply_filters('acf/get_taxonomies', $taxonomies, $args);
-
+ $taxonomies = apply_filters( 'acf/get_taxonomies', $taxonomies, $args );
+
// return
return $taxonomies;
}
/**
-* acf_get_taxonomies_for_post_type
-*
-* Returns an array of taxonomies for a given post type(s)
-*
-* @date 7/9/18
-* @since 5.7.5
-*
-* @param string|array $post_types The post types to compare against.
-* @return array
-*/
+ * acf_get_taxonomies_for_post_type
+ *
+ * Returns an array of taxonomies for a given post type(s)
+ *
+ * @date 7/9/18
+ * @since 5.7.5
+ *
+ * @param string|array $post_types The post types to compare against.
+ * @return array
+ */
function acf_get_taxonomies_for_post_type( $post_types = 'post' ) {
-
+
// vars
$taxonomies = array();
-
+
// loop
- foreach( (array) $post_types as $post_type ) {
+ foreach ( (array) $post_types as $post_type ) {
$object_taxonomies = get_object_taxonomies( $post_type );
- foreach( (array) $object_taxonomies as $taxonomy ) {
- $taxonomies[] = $taxonomy;
+ foreach ( (array) $object_taxonomies as $taxonomy ) {
+ $taxonomies[] = $taxonomy;
}
}
-
+
// remove duplicates
- $taxonomies = array_unique($taxonomies);
-
+ $taxonomies = array_unique( $taxonomies );
+
// return
return $taxonomies;
}
@@ -79,414 +81,426 @@ function acf_get_taxonomies_for_post_type( $post_types = 'post' ) {
*
* Returns an array of taxonomies in the format "name => label" for use in a select field.
*
-* @date 3/8/18
-* @since 5.7.2
+* @date 3/8/18
+* @since 5.7.2
*
-* @param array $taxonomies Optional. An array of specific taxonomies to return.
-* @return array
+* @param array $taxonomies Optional. An array of specific taxonomies to return.
+* @return array
*/
function acf_get_taxonomy_labels( $taxonomies = array() ) {
-
+
// default
- if( empty($taxonomies) ) {
+ if ( empty( $taxonomies ) ) {
$taxonomies = acf_get_taxonomies();
}
-
+
// vars
- $ref = array();
+ $ref = array();
$data = array();
-
+
// loop
- foreach( $taxonomies as $taxonomy ) {
-
+ foreach ( $taxonomies as $taxonomy ) {
+
// vars
$object = get_taxonomy( $taxonomy );
- $label = $object->labels->singular_name;
-
+ $label = $object->labels->singular_name;
+
// append
$data[ $taxonomy ] = $label;
-
+
// increase counter
- if( !isset($ref[ $label ]) ) {
+ if ( ! isset( $ref[ $label ] ) ) {
$ref[ $label ] = 0;
}
$ref[ $label ]++;
}
-
+
// show taxonomy name next to label for shared labels
- foreach( $data as $taxonomy => $label ) {
- if( $ref[$label] > 1 ) {
+ foreach ( $data as $taxonomy => $label ) {
+ if ( $ref[ $label ] > 1 ) {
$data[ $taxonomy ] .= ' (' . $taxonomy . ')';
}
}
-
+
// return
return $data;
}
/**
-* acf_get_term_title
-*
-* Returns the title for this term object.
-*
-* @date 10/9/18
-* @since 5.0.0
-*
-* @param object $term The WP_Term object.
-* @return string
-*/
+ * acf_get_term_title
+ *
+ * Returns the title for this term object.
+ *
+ * @date 10/9/18
+ * @since 5.0.0
+ *
+ * @param object $term The WP_Term object.
+ * @return string
+ */
function acf_get_term_title( $term ) {
$title = $term->name;
-
+
// Allow for empty name.
- if( $title === '' ) {
- $title = __('(no title)', 'acf');
+ if ( $title === '' ) {
+ $title = __( '(no title)', 'acf' );
}
-
+
// Prepend ancestors indentation.
- if( is_taxonomy_hierarchical($term->taxonomy) ) {
+ if ( is_taxonomy_hierarchical( $term->taxonomy ) ) {
$ancestors = get_ancestors( $term->term_id, $term->taxonomy );
- $title = str_repeat('- ', count($ancestors)) . $title;
+ $title = str_repeat( '- ', count( $ancestors ) ) . $title;
}
-
+
return $title;
}
/**
-* acf_get_grouped_terms
-*
-* Returns an array of terms for the given query $args and groups by taxonomy name.
-*
-* @date 2/8/18
-* @since 5.7.2
-*
-* @param array $args An array of args used in the get_terms() function.
-* @return array
-*/
+ * acf_get_grouped_terms
+ *
+ * Returns an array of terms for the given query $args and groups by taxonomy name.
+ *
+ * @date 2/8/18
+ * @since 5.7.2
+ *
+ * @param array $args An array of args used in the get_terms() function.
+ * @return array
+ */
function acf_get_grouped_terms( $args ) {
-
+
// vars
$data = array();
-
+
// defaults
- $args = wp_parse_args($args, array(
- 'taxonomy' => null,
- 'hide_empty' => false,
- 'update_term_meta_cache' => false,
- ));
-
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'taxonomy' => null,
+ 'hide_empty' => false,
+ 'update_term_meta_cache' => false,
+ )
+ );
+
// vars
- $taxonomies = acf_get_taxonomy_labels( acf_get_array($args['taxonomy']) );
- $is_single = (count($taxonomies) == 1);
-
+ $taxonomies = acf_get_taxonomy_labels( acf_get_array( $args['taxonomy'] ) );
+ $is_single = ( count( $taxonomies ) == 1 );
+
// specify exact taxonomies required for _acf_terms_clauses() to work.
- $args['taxonomy'] = array_keys($taxonomies);
-
+ $args['taxonomy'] = array_keys( $taxonomies );
+
// add filter to group results by taxonomy
- if( !$is_single ) {
- add_filter('terms_clauses', '_acf_terms_clauses', 10, 3);
+ if ( ! $is_single ) {
+ add_filter( 'terms_clauses', '_acf_terms_clauses', 10, 3 );
}
-
+
// get terms
$terms = get_terms( $args );
-
+
// remove this filter (only once)
- if( !$is_single ) {
- remove_filter('terms_clauses', '_acf_terms_clauses', 10, 3);
+ if ( ! $is_single ) {
+ remove_filter( 'terms_clauses', '_acf_terms_clauses', 10, 3 );
}
-
+
// loop
- foreach( $taxonomies as $taxonomy => $label ) {
-
+ foreach ( $taxonomies as $taxonomy => $label ) {
+
// vars
$this_terms = array();
-
+
// populate $this_terms
- foreach( $terms as $term ) {
- if( $term->taxonomy == $taxonomy ) {
+ foreach ( $terms as $term ) {
+ if ( $term->taxonomy == $taxonomy ) {
$this_terms[] = $term;
}
}
-
+
// bail early if no $items
- if( empty($this_terms) ) continue;
-
+ if ( empty( $this_terms ) ) {
+ continue;
+ }
+
// sort into hierachial order
// this will fail if a search has taken place because parents wont exist
- if( is_taxonomy_hierarchical($taxonomy) && empty($args['s'])) {
-
+ if ( is_taxonomy_hierarchical( $taxonomy ) && empty( $args['s'] ) ) {
+
// get all terms from this taxonomy
- $all_terms = get_terms(array_merge($args, array(
- 'number' => 0,
- 'offset' => 0,
- 'taxonomy' => $taxonomy
- )));
-
+ $all_terms = get_terms(
+ array_merge(
+ $args,
+ array(
+ 'number' => 0,
+ 'offset' => 0,
+ 'taxonomy' => $taxonomy,
+ )
+ )
+ );
+
// vars
- $length = count($this_terms);
+ $length = count( $this_terms );
$offset = 0;
-
+
// find starting point (offset)
- foreach( $all_terms as $i => $term ) {
- if( $term->term_id == $this_terms[0]->term_id ) {
+ foreach ( $all_terms as $i => $term ) {
+ if ( $term->term_id == $this_terms[0]->term_id ) {
$offset = $i;
break;
}
}
-
+
// order terms
- $parent = acf_maybe_get( $args, 'parent', 0 );
- $parent = acf_maybe_get( $args, 'child_of', $parent );
+ $parent = acf_maybe_get( $args, 'parent', 0 );
+ $parent = acf_maybe_get( $args, 'child_of', $parent );
$ordered_terms = _get_term_children( $parent, $all_terms, $taxonomy );
-
+
// compare aray lengths
// if $ordered_posts is smaller than $all_posts, WP has lost posts during the get_page_children() function
// this is possible when get_post( $args ) filter out parents (via taxonomy, meta and other search parameters)
- if( count($ordered_terms) == count($all_terms) ) {
- $this_terms = array_slice($ordered_terms, $offset, $length);
+ if ( count( $ordered_terms ) == count( $all_terms ) ) {
+ $this_terms = array_slice( $ordered_terms, $offset, $length );
}
}
-
+
// populate group
$data[ $label ] = array();
- foreach( $this_terms as $term ) {
+ foreach ( $this_terms as $term ) {
$data[ $label ][ $term->term_id ] = $term;
- }
+ }
}
-
+
// return
return $data;
}
/**
-* _acf_terms_clauses
-*
-* Used in the 'terms_clauses' filter to order terms by taxonomy name.
-*
-* @date 2/8/18
-* @since 5.7.2
-*
-* @param array $pieces Terms query SQL clauses.
-* @param array $taxonomies An array of taxonomies.
-* @param array $args An array of terms query arguments.
-* @return array $pieces
-*/
+ * _acf_terms_clauses
+ *
+ * Used in the 'terms_clauses' filter to order terms by taxonomy name.
+ *
+ * @date 2/8/18
+ * @since 5.7.2
+ *
+ * @param array $pieces Terms query SQL clauses.
+ * @param array $taxonomies An array of taxonomies.
+ * @param array $args An array of terms query arguments.
+ * @return array $pieces
+ */
function _acf_terms_clauses( $pieces, $taxonomies, $args ) {
-
+
// prepend taxonomy to 'orderby' SQL
- if( is_array($taxonomies) ) {
- $sql = "FIELD(tt.taxonomy,'" . implode("', '", array_map('esc_sql', $taxonomies)) . "')";
- $pieces['orderby'] = str_replace("ORDER BY", "ORDER BY $sql,", $pieces['orderby']);
+ if ( is_array( $taxonomies ) ) {
+ $sql = "FIELD(tt.taxonomy,'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
+ $pieces['orderby'] = str_replace( 'ORDER BY', "ORDER BY $sql,", $pieces['orderby'] );
}
-
- // return
+
+ // return
return $pieces;
}
/**
-* acf_get_pretty_taxonomies
-*
-* Deprecated in favor of acf_get_taxonomy_labels() function.
-*
-* @date 7/10/13
-* @since 5.0.0
-* @deprecated 5.7.2
-*/
+ * acf_get_pretty_taxonomies
+ *
+ * Deprecated in favor of acf_get_taxonomy_labels() function.
+ *
+ * @date 7/10/13
+ * @since 5.0.0
+ * @deprecated 5.7.2
+ */
function acf_get_pretty_taxonomies( $taxonomies = array() ) {
return acf_get_taxonomy_labels( $taxonomies );
}
/**
-* acf_get_term
-*
-* Similar to get_term() but with some extra functionality.
-*
-* @date 19/8/18
-* @since 5.7.3
-*
-* @param mixed $term_id The term ID or a string of "taxonomy:slug".
-* @param string $taxonomy The taxonomyname.
-* @return WP_Term
-*/
+ * acf_get_term
+ *
+ * Similar to get_term() but with some extra functionality.
+ *
+ * @date 19/8/18
+ * @since 5.7.3
+ *
+ * @param mixed $term_id The term ID or a string of "taxonomy:slug".
+ * @param string $taxonomy The taxonomyname.
+ * @return WP_Term
+ */
function acf_get_term( $term_id, $taxonomy = '' ) {
-
+
// allow $term_id parameter to be a string of "taxonomy:slug" or "taxonomy:id"
- if( is_string($term_id) && strpos($term_id, ':') ) {
- list( $taxonomy, $term_id ) = explode(':', $term_id);
- $term = get_term_by( 'slug', $term_id, $taxonomy );
- if( $term ) return $term;
+ if ( is_string( $term_id ) && strpos( $term_id, ':' ) ) {
+ list( $taxonomy, $term_id ) = explode( ':', $term_id );
+ $term = get_term_by( 'slug', $term_id, $taxonomy );
+ if ( $term ) {
+ return $term;
+ }
}
-
+
// return
return get_term( $term_id, $taxonomy );
}
/**
-* acf_encode_term
-*
-* Returns a "taxonomy:slug" string for a given WP_Term.
-*
-* @date 27/8/18
-* @since 5.7.4
-*
-* @param WP_Term $term The term object.
-* @return string
-*/
+ * acf_encode_term
+ *
+ * Returns a "taxonomy:slug" string for a given WP_Term.
+ *
+ * @date 27/8/18
+ * @since 5.7.4
+ *
+ * @param WP_Term $term The term object.
+ * @return string
+ */
function acf_encode_term( $term ) {
return "{$term->taxonomy}:{$term->slug}";
}
/**
-* acf_decode_term
-*
-* Decodes a "taxonomy:slug" string into an array of taxonomy and slug.
-*
-* @date 27/8/18
-* @since 5.7.4
-*
-* @param WP_Term $term The term object.
-* @return string
-*/
+ * acf_decode_term
+ *
+ * Decodes a "taxonomy:slug" string into an array of taxonomy and slug.
+ *
+ * @date 27/8/18
+ * @since 5.7.4
+ *
+ * @param WP_Term $term The term object.
+ * @return string
+ */
function acf_decode_term( $string ) {
- if( is_string($string) && strpos($string, ':') ) {
- list( $taxonomy, $slug ) = explode(':', $string);
+ if ( is_string( $string ) && strpos( $string, ':' ) ) {
+ list( $taxonomy, $slug ) = explode( ':', $string );
return compact( 'taxonomy', 'slug' );
}
return false;
}
/**
-* acf_get_encoded_terms
-*
-* Returns an array of WP_Term objects from an array of encoded strings
-*
-* @date 9/9/18
-* @since 5.7.5
-*
-* @param array $values The array of encoded strings.
-* @return array
-*/
+ * acf_get_encoded_terms
+ *
+ * Returns an array of WP_Term objects from an array of encoded strings
+ *
+ * @date 9/9/18
+ * @since 5.7.5
+ *
+ * @param array $values The array of encoded strings.
+ * @return array
+ */
function acf_get_encoded_terms( $values ) {
-
+
// vars
$terms = array();
-
+
// loop over values
- foreach( (array) $values as $value ) {
-
+ foreach ( (array) $values as $value ) {
+
// find term from string
$term = acf_get_term( $value );
-
+
// append
- if( $term instanceof WP_Term ) {
+ if ( $term instanceof WP_Term ) {
$terms[] = $term;
}
}
-
+
// return
return $terms;
}
/**
-* acf_get_choices_from_terms
-*
-* Returns an array of choices from the terms provided.
-*
-* @date 8/9/18
-* @since 5.7.5
-*
-* @param array $values and array of WP_Terms objects or encoded strings.
-* @param string $format The value format (term_id, slug).
-* @return array
-*/
+ * acf_get_choices_from_terms
+ *
+ * Returns an array of choices from the terms provided.
+ *
+ * @date 8/9/18
+ * @since 5.7.5
+ *
+ * @param array $values and array of WP_Terms objects or encoded strings.
+ * @param string $format The value format (term_id, slug).
+ * @return array
+ */
function acf_get_choices_from_terms( $terms, $format = 'term_id' ) {
-
+
// vars
$groups = array();
-
+
// get taxonomy lables
$labels = acf_get_taxonomy_labels();
-
+
// convert array of encoded strings to terms
- $term = reset($terms);
- if( !$term instanceof WP_Term ) {
+ $term = reset( $terms );
+ if ( ! $term instanceof WP_Term ) {
$terms = acf_get_encoded_terms( $terms );
}
-
+
// loop over terms
- foreach( $terms as $term ) {
- $group = $labels[ $term->taxonomy ];
- $choice = acf_get_choice_from_term( $term, $format );
+ foreach ( $terms as $term ) {
+ $group = $labels[ $term->taxonomy ];
+ $choice = acf_get_choice_from_term( $term, $format );
$groups[ $group ][ $choice['id'] ] = $choice['text'];
}
-
+
// return
return $groups;
}
/**
-* acf_get_choices_from_grouped_terms
-*
-* Returns an array of choices from the grouped terms provided.
-*
-* @date 8/9/18
-* @since 5.7.5
-*
-* @param array $value A grouped array of WP_Terms objects.
-* @param string $format The value format (term_id, slug).
-* @return array
-*/
+ * acf_get_choices_from_grouped_terms
+ *
+ * Returns an array of choices from the grouped terms provided.
+ *
+ * @date 8/9/18
+ * @since 5.7.5
+ *
+ * @param array $value A grouped array of WP_Terms objects.
+ * @param string $format The value format (term_id, slug).
+ * @return array
+ */
function acf_get_choices_from_grouped_terms( $value, $format = 'term_id' ) {
-
+
// vars
$groups = array();
-
+
// loop over values
- foreach( $value as $group => $terms ) {
+ foreach ( $value as $group => $terms ) {
$groups[ $group ] = array();
- foreach( $terms as $term_id => $term ) {
- $choice = acf_get_choice_from_term( $term, $format );
+ foreach ( $terms as $term_id => $term ) {
+ $choice = acf_get_choice_from_term( $term, $format );
$groups[ $group ][ $choice['id'] ] = $choice['text'];
}
}
-
+
// return
return $groups;
}
/**
-* acf_get_choice_from_term
-*
-* Returns an array containing the id and text for this item.
-*
-* @date 10/9/18
-* @since 5.7.6
-*
-* @param object $item The item object such as WP_Post or WP_Term.
-* @param string $format The value format (term_id, slug)
-* @return array
-*/
+ * acf_get_choice_from_term
+ *
+ * Returns an array containing the id and text for this item.
+ *
+ * @date 10/9/18
+ * @since 5.7.6
+ *
+ * @param object $item The item object such as WP_Post or WP_Term.
+ * @param string $format The value format (term_id, slug)
+ * @return array
+ */
function acf_get_choice_from_term( $term, $format = 'term_id' ) {
-
+
// vars
- $id = $term->term_id;
+ $id = $term->term_id;
$text = acf_get_term_title( $term );
-
+
// return format
- if( $format == 'slug' ) {
- $id = acf_encode_term($term);
+ if ( $format == 'slug' ) {
+ $id = acf_encode_term( $term );
}
-
+
// return
return array(
- 'id' => $id,
- 'text' => $text
+ 'id' => $id,
+ 'text' => $text,
);
}
@@ -494,15 +508,15 @@ function acf_get_choice_from_term( $term, $format = 'term_id' ) {
* Returns a valid post_id string for a given term and taxonomy.
* No longer needed since WP introduced the termmeta table in WP 4.4.
*
- * @date 6/2/17
- * @since 5.5.6
+ * @date 6/2/17
+ * @since 5.5.6
* @deprecated 5.9.2
*
- * @param $taxonomy (string) The taxonomy type.
- * @param $term_id (int) The term ID.
- * @return (string)
+ * @param $taxonomy (string) The taxonomy type.
+ * @param $term_id (int) The term ID.
+ * @return (string)
*/
function acf_get_term_post_id( $taxonomy, $term_id ) {
_deprecated_function( __FUNCTION__, '5.9.2', 'string format term_%d' );
return 'term_' . $term_id;
-}
\ No newline at end of file
+}
diff --git a/includes/assets.php b/includes/assets.php
index 3e28d59..a1199d1 100644
--- a/includes/assets.php
+++ b/includes/assets.php
@@ -1,603 +1,614 @@
- $v ) {
- $this->text[ $k ] = $v;
- }
- }
-
- /**
- * Appends an array of l10n data.
- *
- * @date 13/4/18
- * @since 5.6.9
- *
- * @param array $data An array of data for l10n.
- * @return void
- */
- public function add_data( $data ) {
- foreach( (array) $data as $k => $v ) {
- $this->data[ $k ] = $v;
- }
- }
-
- /**
- * Registers the ACF scripts and styles.
- *
- * @date 10/4/18
- * @since 5.6.9
- *
- * @param void
- * @return void
- */
- public function register_scripts() {
- // Extract vars.
- $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
- $version = acf_get_setting('version');
-
- // Register scripts.
- wp_register_script( 'acf', acf_get_url( 'assets/build/js/acf' . $suffix . '.js' ), array( 'jquery' ), $version );
- wp_register_script( 'acf-input', acf_get_url( 'assets/build/js/acf-input' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-resizable', 'acf' ), $version );
- wp_register_script( 'acf-field-group', acf_get_url( 'assets/build/js/acf-field-group' . $suffix . '.js' ), array( 'acf-input' ), $version );
-
- // Register styles.
- wp_register_style( 'acf-global', acf_get_url( 'assets/build/css/acf-global.css' ), array( 'dashicons' ), $version );
- wp_register_style( 'acf-input', acf_get_url( 'assets/build/css/acf-input.css' ), array( 'acf-global' ), $version );
- wp_register_style( 'acf-field-group', acf_get_url( 'assets/build/css/acf-field-group.css' ), array( 'acf-input' ), $version );
-
/**
- * Fires after core scripts and styles have been registered.
+ * Storage for i18n data.
*
- * @since 5.6.9
- *
- * @param string $version The ACF version.
- * @param string $suffix The potential ".min" filename suffix.
+ * @since 5.6.9
+ * @var array
*/
- do_action( 'acf/register_scripts', $version, $suffix );
- }
+ public $text = array();
- /**
- * Enqueues a script and sets up actions for priting supplemental scripts.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param string $name The script name.
- * @return void
- */
- public function enqueue_script( $name ) {
- wp_enqueue_script( $name );
- $this->add_actions();
- }
+ /**
+ * Storage for l10n data.
+ *
+ * @since 5.6.9
+ * @var array
+ */
+ public $data = array();
- /**
- * Enqueues a style.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param string $name The style name.
- * @return void
- */
- public function enqueue_style( $name ) {
- wp_enqueue_style( $name );
- }
-
- /**
- * Adds the actions needed to print supporting inline scripts.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- private function add_actions() {
-
- // Only run once.
- if( acf_has_done('ACF_Assets::add_actions') ) {
- return;
+ /**
+ * List of enqueue flags.
+ *
+ * @since 5.9.0
+ * @var bool
+ */
+ private $enqueue = array();
+
+ /**
+ * Constructor.
+ *
+ * @date 10/4/18
+ * @since 5.6.9
+ *
+ * @param void
+ * @return void
+ */
+ public function __construct() {
+ add_action( 'init', array( $this, 'register_scripts' ) );
}
-
- // Add actions.
- $this->add_action( 'admin_enqueue_scripts', 'enqueue_scripts' , 20 );
- $this->add_action( 'admin_print_scripts', 'print_scripts', 20 );
- $this->add_action( 'admin_print_footer_scripts', 'print_footer_scripts', 20 );
- }
-
- /**
- * Extends the add_action() function with two additional features:
- * 1. Renames $action depending on the current page (customizer, login, front-end).
- * 2. Alters the priotiry or calls the method directly if the action has already passed.
- *
- * @date 28/4/20
- * @since 5.9.0
- *
- * @param string $action The action name.
- * @param string $method The method name.
- * @param int $priority See add_action().
- * @param int $accepted_args See add_action().
- * @return void
- */
- public function add_action( $action, $method, $priority = 10, $accepted_args = 1 ) {
-
- // Generate an array of action replacements.
- $replacements = array(
- 'customizer' => array(
- 'admin_enqueue_scripts' => 'admin_enqueue_scripts',
- 'admin_print_scripts' => 'customize_controls_print_scripts',
- 'admin_head' => 'customize_controls_print_scripts',
- 'admin_footer' => 'customize_controls_print_footer_scripts',
- 'admin_print_footer_scripts' => 'customize_controls_print_footer_scripts'
- ),
- 'login' => array(
- 'admin_enqueue_scripts' => 'login_enqueue_scripts',
- 'admin_print_scripts' => 'login_head',
- 'admin_head' => 'login_head',
- 'admin_footer' => 'login_footer',
- 'admin_print_footer_scripts' => 'login_footer'
- ),
- 'wp' => array(
- 'admin_enqueue_scripts' => 'wp_enqueue_scripts',
- 'admin_print_scripts' => 'wp_print_scripts',
- 'admin_head' => 'wp_head',
- 'admin_footer' => 'wp_footer',
- 'admin_print_footer_scripts' => 'wp_print_footer_scripts'
- )
- );
-
- // Determine the current context.
- if( did_action('customize_controls_init') ) {
- $context = 'customizer';
- } elseif( did_action('login_form_register') ) {
- $context = 'login';
- } elseif( is_admin() ) {
- $context = 'admin';
- } else {
- $context = 'wp';
- }
-
- // Replace action if possible.
- if( isset( $replacements[ $context ][ $action ] ) ) {
- $action = $replacements[ $context ][ $action ];
- }
-
- // Check if action is currently being or has already been run.
- if( did_action($action) ) {
- $doing = acf_doing_action( $action );
- if( $doing && $doing < $priority ) {
- // Allow action to be added as per usual.
- } else {
- // Call method directly.
- return call_user_func( array( $this, $method ) );
+
+ /**
+ * Magic __call method for backwards compatibility.
+ *
+ * @date 10/4/20
+ * @since 5.9.0
+ *
+ * @param string $name The method name.
+ * @param array $arguments The array of arguments.
+ * @return mixed
+ */
+ public function __call( $name, $arguments ) {
+ switch ( $name ) {
+ case 'admin_enqueue_scripts':
+ case 'admin_print_scripts':
+ case 'admin_head':
+ case 'admin_footer':
+ case 'admin_print_footer_scripts':
+ _doing_it_wrong( __FUNCTION__, 'The ACF_Assets class should not be accessed directly.', '5.9.0' );
}
}
-
- // Add action.
- add_action( $action, array( $this, $method ), $priority, $accepted_args );
- }
-
- /**
- * Generic controller for enqueuing scripts and styles.
- *
- * @date 28/4/20
- * @since 5.9.0
- *
- * @param array $args {
- * @type bool $uploader Whether or not to enqueue uploader scripts.
- * }
- * @return void
- */
- public function enqueue( $args = array() ) {
-
- // Apply defaults.
- $args = wp_parse_args($args, array(
- 'input' => true,
- 'uploader' => false
- ));
-
- // Set enqueue flags and add actions.
- if( $args['input'] ) {
- $this->enqueue[] = 'input';
- }
- if( $args['uploader'] ) {
- $this->enqueue[] = 'uploader';
- }
- $this->add_actions();
- }
-
- /**
- * Enqueues the scripts and styles needed for the WP media uploader.
- *
- * @date 27/10/2014
- * @since 5.0.9
- *
- * @param void
- * @return void
- */
- public function enqueue_uploader() {
-
- // Only run once.
- if( acf_has_done('ACF_Assets::enqueue_uploader') ) {
- return;
- }
-
- // Enqueue media assets.
- if( current_user_can('upload_files') ) {
- wp_enqueue_media();
- }
-
- // Add actions.
- $this->add_action( 'admin_footer', 'print_uploader_scripts', 1 );
/**
- * Fires when enqueuing the uploader.
+ * Appends an array of i18n data.
*
- * @since 5.6.9
+ * @date 13/4/18
+ * @since 5.6.9
*
- * @param void
+ * @param array $text An array of text for i18n.
+ * @return void
*/
- do_action( 'acf/enqueue_uploader' );
- }
-
- /**
- * Enqueues and localizes scripts.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- public function enqueue_scripts() {
-
- // Enqueue input scripts.
- if( in_array('input', $this->enqueue) ) {
- wp_enqueue_script( 'acf-input' );
- wp_enqueue_style( 'acf-input' );
+ public function add_text( $text ) {
+ foreach ( (array) $text as $k => $v ) {
+ $this->text[ $k ] = $v;
+ }
}
- // Enqueue media scripts.
- if( in_array('uploader', $this->enqueue) ) {
- $this->enqueue_uploader();
+ /**
+ * Appends an array of l10n data.
+ *
+ * @date 13/4/18
+ * @since 5.6.9
+ *
+ * @param array $data An array of data for l10n.
+ * @return void
+ */
+ public function add_data( $data ) {
+ foreach ( (array) $data as $k => $v ) {
+ $this->data[ $k ] = $v;
+ }
}
- // Localize text.
- acf_localize_text(array(
-
- // Tooltip
- 'Are you sure?' => __('Are you sure?','acf'),
- 'Yes' => __('Yes','acf'),
- 'No' => __('No','acf'),
- 'Remove' => __('Remove','acf'),
- 'Cancel' => __('Cancel','acf'),
- ));
-
- // Localize "input" text.
- if( wp_script_is('acf-input') ) {
- acf_localize_text(array(
-
- // Unload
- 'The changes you made will be lost if you navigate away from this page' => __('The changes you made will be lost if you navigate away from this page', 'acf'),
-
- // Validation
- 'Validation successful' => __('Validation successful', 'acf'),
- 'Validation failed' => __('Validation failed', 'acf'),
- '1 field requires attention' => __('1 field requires attention', 'acf'),
- '%d fields require attention' => __('%d fields require attention', 'acf'),
-
- // Other
- 'Edit field group' => __('Edit field group', 'acf'),
- ));
-
+ /**
+ * Registers the ACF scripts and styles.
+ *
+ * @date 10/4/18
+ * @since 5.6.9
+ *
+ * @param void
+ * @return void
+ */
+ public function register_scripts() {
+ // Extract vars.
+ $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+ $version = acf_get_setting( 'version' );
+
+ // Register scripts.
+ wp_register_script( 'acf', acf_get_url( 'assets/build/js/acf' . $suffix . '.js' ), array( 'jquery' ), $version );
+ wp_register_script( 'acf-input', acf_get_url( 'assets/build/js/acf-input' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-resizable', 'acf' ), $version );
+ wp_register_script( 'acf-field-group', acf_get_url( 'assets/build/js/acf-field-group' . $suffix . '.js' ), array( 'acf-input' ), $version );
+
+ // Register styles.
+ wp_register_style( 'acf-global', acf_get_url( 'assets/build/css/acf-global.css' ), array( 'dashicons' ), $version );
+ wp_register_style( 'acf-input', acf_get_url( 'assets/build/css/acf-input.css' ), array( 'acf-global' ), $version );
+ wp_register_style( 'acf-field-group', acf_get_url( 'assets/build/css/acf-field-group.css' ), array( 'acf-input' ), $version );
+
+ /**
+ * Fires after core scripts and styles have been registered.
+ *
+ * @since 5.6.9
+ *
+ * @param string $version The ACF version.
+ * @param string $suffix The potential ".min" filename suffix.
+ */
+ do_action( 'acf/register_scripts', $version, $suffix );
+ }
+
+ /**
+ * Enqueues a script and sets up actions for priting supplemental scripts.
+ *
+ * @date 27/4/20
+ * @since 5.9.0
+ *
+ * @param string $name The script name.
+ * @return void
+ */
+ public function enqueue_script( $name ) {
+ wp_enqueue_script( $name );
+ $this->add_actions();
+ }
+
+ /**
+ * Enqueues a style.
+ *
+ * @date 27/4/20
+ * @since 5.9.0
+ *
+ * @param string $name The style name.
+ * @return void
+ */
+ public function enqueue_style( $name ) {
+ wp_enqueue_style( $name );
+ }
+
+ /**
+ * Adds the actions needed to print supporting inline scripts.
+ *
+ * @date 27/4/20
+ * @since 5.9.0
+ *
+ * @param void
+ * @return void
+ */
+ private function add_actions() {
+
+ // Only run once.
+ if ( acf_has_done( 'ACF_Assets::add_actions' ) ) {
+ return;
+ }
+
+ // Add actions.
+ $this->add_action( 'admin_enqueue_scripts', 'enqueue_scripts', 20 );
+ $this->add_action( 'admin_print_scripts', 'print_scripts', 20 );
+ $this->add_action( 'admin_print_footer_scripts', 'print_footer_scripts', 20 );
+ }
+
+ /**
+ * Extends the add_action() function with two additional features:
+ * 1. Renames $action depending on the current page (customizer, login, front-end).
+ * 2. Alters the priotiry or calls the method directly if the action has already passed.
+ *
+ * @date 28/4/20
+ * @since 5.9.0
+ *
+ * @param string $action The action name.
+ * @param string $method The method name.
+ * @param int $priority See add_action().
+ * @param int $accepted_args See add_action().
+ * @return void
+ */
+ public function add_action( $action, $method, $priority = 10, $accepted_args = 1 ) {
+
+ // Generate an array of action replacements.
+ $replacements = array(
+ 'customizer' => array(
+ 'admin_enqueue_scripts' => 'admin_enqueue_scripts',
+ 'admin_print_scripts' => 'customize_controls_print_scripts',
+ 'admin_head' => 'customize_controls_print_scripts',
+ 'admin_footer' => 'customize_controls_print_footer_scripts',
+ 'admin_print_footer_scripts' => 'customize_controls_print_footer_scripts',
+ ),
+ 'login' => array(
+ 'admin_enqueue_scripts' => 'login_enqueue_scripts',
+ 'admin_print_scripts' => 'login_head',
+ 'admin_head' => 'login_head',
+ 'admin_footer' => 'login_footer',
+ 'admin_print_footer_scripts' => 'login_footer',
+ ),
+ 'wp' => array(
+ 'admin_enqueue_scripts' => 'wp_enqueue_scripts',
+ 'admin_print_scripts' => 'wp_print_scripts',
+ 'admin_head' => 'wp_head',
+ 'admin_footer' => 'wp_footer',
+ 'admin_print_footer_scripts' => 'wp_print_footer_scripts',
+ ),
+ );
+
+ // Determine the current context.
+ if ( did_action( 'customize_controls_init' ) ) {
+ $context = 'customizer';
+ } elseif ( did_action( 'login_form_register' ) ) {
+ $context = 'login';
+ } elseif ( is_admin() ) {
+ $context = 'admin';
+ } else {
+ $context = 'wp';
+ }
+
+ // Replace action if possible.
+ if ( isset( $replacements[ $context ][ $action ] ) ) {
+ $action = $replacements[ $context ][ $action ];
+ }
+
+ // Check if action is currently being or has already been run.
+ if ( did_action( $action ) ) {
+ $doing = acf_doing_action( $action );
+ if ( $doing && $doing < $priority ) {
+ // Allow action to be added as per usual.
+ } else {
+ // Call method directly.
+ return call_user_func( array( $this, $method ) );
+ }
+ }
+
+ // Add action.
+ add_action( $action, array( $this, $method ), $priority, $accepted_args );
+ }
+
+ /**
+ * Generic controller for enqueuing scripts and styles.
+ *
+ * @date 28/4/20
+ * @since 5.9.0
+ *
+ * @param array $args {
+ * @type bool $uploader Whether or not to enqueue uploader scripts.
+ * }
+ * @return void
+ */
+ public function enqueue( $args = array() ) {
+
+ // Apply defaults.
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'input' => true,
+ 'uploader' => false,
+ )
+ );
+
+ // Set enqueue flags and add actions.
+ if ( $args['input'] ) {
+ $this->enqueue[] = 'input';
+ }
+ if ( $args['uploader'] ) {
+ $this->enqueue[] = 'uploader';
+ }
+ $this->add_actions();
+ }
+
+ /**
+ * Enqueues the scripts and styles needed for the WP media uploader.
+ *
+ * @date 27/10/2014
+ * @since 5.0.9
+ *
+ * @param void
+ * @return void
+ */
+ public function enqueue_uploader() {
+
+ // Only run once.
+ if ( acf_has_done( 'ACF_Assets::enqueue_uploader' ) ) {
+ return;
+ }
+
+ // Enqueue media assets.
+ if ( current_user_can( 'upload_files' ) ) {
+ wp_enqueue_media();
+ }
+
+ // Add actions.
+ $this->add_action( 'admin_footer', 'print_uploader_scripts', 1 );
+
+ /**
+ * Fires when enqueuing the uploader.
+ *
+ * @since 5.6.9
+ *
+ * @param void
+ */
+ do_action( 'acf/enqueue_uploader' );
+ }
+
+ /**
+ * Enqueues and localizes scripts.
+ *
+ * @date 27/4/20
+ * @since 5.9.0
+ *
+ * @param void
+ * @return void
+ */
+ public function enqueue_scripts() {
+
+ // Enqueue input scripts.
+ if ( in_array( 'input', $this->enqueue ) ) {
+ wp_enqueue_script( 'acf-input' );
+ wp_enqueue_style( 'acf-input' );
+ }
+
+ // Enqueue media scripts.
+ if ( in_array( 'uploader', $this->enqueue ) ) {
+ $this->enqueue_uploader();
+ }
+
+ // Localize text.
+ acf_localize_text(
+ array(
+
+ // Tooltip
+ 'Are you sure?' => __( 'Are you sure?', 'acf' ),
+ 'Yes' => __( 'Yes', 'acf' ),
+ 'No' => __( 'No', 'acf' ),
+ 'Remove' => __( 'Remove', 'acf' ),
+ 'Cancel' => __( 'Cancel', 'acf' ),
+ )
+ );
+
+ // Localize "input" text.
+ if ( wp_script_is( 'acf-input' ) ) {
+ acf_localize_text(
+ array(
+
+ // Unload
+ 'The changes you made will be lost if you navigate away from this page' => __( 'The changes you made will be lost if you navigate away from this page', 'acf' ),
+
+ // Validation
+ 'Validation successful' => __( 'Validation successful', 'acf' ),
+ 'Validation failed' => __( 'Validation failed', 'acf' ),
+ '1 field requires attention' => __( '1 field requires attention', 'acf' ),
+ '%d fields require attention' => __( '%d fields require attention', 'acf' ),
+
+ // Other
+ 'Edit field group' => __( 'Edit field group', 'acf' ),
+ )
+ );
+
+ /**
+ * Fires during "admin_enqueue_scripts" when ACF scripts are enqueued.
+ *
+ * @since 5.6.9
+ *
+ * @param void
+ */
+ do_action( 'acf/input/admin_enqueue_scripts' );
+ }
+
/**
* Fires during "admin_enqueue_scripts" when ACF scripts are enqueued.
*
- * @since 5.6.9
+ * @since 5.6.9
*
- * @param void
+ * @param void
*/
- do_action( 'acf/input/admin_enqueue_scripts' );
- }
-
- /**
- * Fires during "admin_enqueue_scripts" when ACF scripts are enqueued.
- *
- * @since 5.6.9
- *
- * @param void
- */
- do_action( 'acf/admin_enqueue_scripts' );
- do_action( 'acf/enqueue_scripts' );
+ do_action( 'acf/admin_enqueue_scripts' );
+ do_action( 'acf/enqueue_scripts' );
- // Filter i18n translations that differ from English and localize script.
- $text = array();
- foreach( $this->text as $k => $v ) {
- if( str_replace('.verb', '', $k) !== $v ) {
- $text[ $k ] = $v;
+ // Filter i18n translations that differ from English and localize script.
+ $text = array();
+ foreach ( $this->text as $k => $v ) {
+ if ( str_replace( '.verb', '', $k ) !== $v ) {
+ $text[ $k ] = $v;
+ }
+ }
+ if ( $text ) {
+ wp_localize_script( 'acf', 'acfL10n', $text );
}
}
- if( $text ) {
- wp_localize_script( 'acf', 'acfL10n', $text );
- }
- }
-
- /**
- * Prints scripts in head.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- public function print_scripts() {
- if( wp_script_is('acf-input') ) {
-
+
+ /**
+ * Prints scripts in head.
+ *
+ * @date 27/4/20
+ * @since 5.9.0
+ *
+ * @param void
+ * @return void
+ */
+ public function print_scripts() {
+ if ( wp_script_is( 'acf-input' ) ) {
+
+ /**
+ * Fires during "admin_head" when ACF scripts are enqueued.
+ *
+ * @since 5.6.9
+ *
+ * @param void
+ */
+ do_action( 'acf/input/admin_head' );
+ do_action( 'acf/input/admin_print_scripts' );
+ }
+
/**
* Fires during "admin_head" when ACF scripts are enqueued.
*
- * @since 5.6.9
+ * @since 5.6.9
*
- * @param void
+ * @param void
*/
- do_action( 'acf/input/admin_head' );
- do_action( 'acf/input/admin_print_scripts' );
+ do_action( 'acf/admin_head' );
+ do_action( 'acf/admin_print_scripts' );
}
/**
- * Fires during "admin_head" when ACF scripts are enqueued.
+ * Prints scripts in footer.
*
- * @since 5.6.9
+ * @date 27/4/20
+ * @since 5.9.0
*
- * @param void
+ * @param void
+ * @return void
*/
- do_action( 'acf/admin_head' );
- do_action( 'acf/admin_print_scripts' );
- }
-
- /**
- * Prints scripts in footer.
- *
- * @date 27/4/20
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- public function print_footer_scripts() {
- global $wp_version;
-
- // Bail early if 'acf' script was never enqueued (fixes Elementor enqueue reset conflict).
- if( !wp_script_is('acf') ) {
- return;
- }
-
- // Localize data.
- acf_localize_data(array(
- 'admin_url' => admin_url(),
- 'ajaxurl' => admin_url( 'admin-ajax.php' ),
- 'nonce' => wp_create_nonce( 'acf_nonce' ),
- 'acf_version' => acf_get_setting('version'),
- 'wp_version' => $wp_version,
- 'browser' => acf_get_browser(),
- 'locale' => acf_get_locale(),
- 'rtl' => is_rtl(),
- 'screen' => acf_get_form_data('screen'),
- 'post_id' => acf_get_form_data('post_id'),
- 'validation' => acf_get_form_data('validation'),
- 'editor' => acf_is_block_editor() ? 'block' : 'classic'
- ));
-
- // Print inline script.
- printf( "\n", 'acf.data = ' . wp_json_encode( $this->data ) . ';' );
-
- if( wp_script_is('acf-input') ) {
-
- /**
- * Filters an empty array for compat l10n data.
- *
- * @since 5.0.0
- *
- * @param array $data An array of data to append to.
- */
- $compat_l10n = apply_filters( 'acf/input/admin_l10n', array() );
- if( $compat_l10n ) {
- printf( "\n", 'acf.l10n = ' . wp_json_encode( $compat_l10n ) . ';' );
+ public function print_footer_scripts() {
+ global $wp_version;
+
+ // Bail early if 'acf' script was never enqueued (fixes Elementor enqueue reset conflict).
+ if ( ! wp_script_is( 'acf' ) ) {
+ return;
}
-
+
+ // Localize data.
+ acf_localize_data(
+ array(
+ 'admin_url' => admin_url(),
+ 'ajaxurl' => admin_url( 'admin-ajax.php' ),
+ 'nonce' => wp_create_nonce( 'acf_nonce' ),
+ 'acf_version' => acf_get_setting( 'version' ),
+ 'wp_version' => $wp_version,
+ 'browser' => acf_get_browser(),
+ 'locale' => acf_get_locale(),
+ 'rtl' => is_rtl(),
+ 'screen' => acf_get_form_data( 'screen' ),
+ 'post_id' => acf_get_form_data( 'post_id' ),
+ 'validation' => acf_get_form_data( 'validation' ),
+ 'editor' => acf_is_block_editor() ? 'block' : 'classic',
+ )
+ );
+
+ // Print inline script.
+ printf( "\n", 'acf.data = ' . wp_json_encode( $this->data ) . ';' );
+
+ if ( wp_script_is( 'acf-input' ) ) {
+
+ /**
+ * Filters an empty array for compat l10n data.
+ *
+ * @since 5.0.0
+ *
+ * @param array $data An array of data to append to.
+ */
+ $compat_l10n = apply_filters( 'acf/input/admin_l10n', array() );
+ if ( $compat_l10n ) {
+ printf( "\n", 'acf.l10n = ' . wp_json_encode( $compat_l10n ) . ';' );
+ }
+
+ /**
+ * Fires during "admin_footer" when ACF scripts are enqueued.
+ *
+ * @since 5.6.9
+ *
+ * @param void
+ */
+ do_action( 'acf/input/admin_footer' );
+ do_action( 'acf/input/admin_print_footer_scripts' );
+ }
+
/**
* Fires during "admin_footer" when ACF scripts are enqueued.
*
- * @since 5.6.9
+ * @since 5.6.9
*
- * @param void
+ * @param void
*/
- do_action( 'acf/input/admin_footer' );
- do_action( 'acf/input/admin_print_footer_scripts' );
+ do_action( 'acf/admin_footer' );
+ do_action( 'acf/admin_print_footer_scripts' );
+
+ // Once all data is localized, trigger acf.prepare() to execute functionality before DOM ready.
+ printf( "\n", "acf.doAction( 'prepare' );" );
}
-
+
/**
- * Fires during "admin_footer" when ACF scripts are enqueued.
+ * Prints uploader scripts in footer.
*
- * @since 5.6.9
+ * @date 11/06/2020
+ * @since 5.9.0
*
- * @param void
+ * @param void
+ * @return void
*/
- do_action( 'acf/admin_footer' );
- do_action( 'acf/admin_print_footer_scripts' );
-
- // Once all data is localized, trigger acf.prepare() to execute functionality before DOM ready.
- printf( "\n", "acf.doAction( 'prepare' );" );
- }
-
- /**
- * Prints uploader scripts in footer.
- *
- * @date 11/06/2020
- * @since 5.9.0
- *
- * @param void
- * @return void
- */
- public function print_uploader_scripts() {
- // Todo: investigate output-buffer to hide HTML.
- ?>
+ public function print_uploader_scripts() {
+ // Todo: investigate output-buffer to hide HTML.
+ ?>
>
- ' . __( 'Accordions help you organize fields into panels that open and close.', 'acf') . '';
- $message .= '' . __( 'All fields following this accordion (or until another accordion is defined) will be grouped together.','acf') . '
'; - - - // default_value - acf_render_field_setting( $field, array( - 'label' => __('Instructions','acf'), - 'instructions' => '', - 'name' => 'notes', - 'type' => 'message', - 'message' => $message, - )); -*/ - - // active - acf_render_field_setting( $field, array( - 'label' => __('Open','acf'), - 'instructions' => __('Display this accordion as open on page load.','acf'), - 'name' => 'open', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // multi_expand - acf_render_field_setting( $field, array( - 'label' => __('Multi-expand','acf'), - 'instructions' => __('Allow this accordion to open without closing others.','acf'), - 'name' => 'multi_expand', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // endpoint - acf_render_field_setting( $field, array( - 'label' => __('Endpoint','acf'), - 'instructions' => __('Define an endpoint for the previous accordion to stop. This accordion will not be visible.','acf'), - 'name' => 'endpoint', - 'type' => 'true_false', - 'ui' => 1, - )); - - } - - - /* - * load_field() - * - * This filter is appied to the $field after it is loaded from the database - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $field - the field array holding all the field options - * - * @return $field - the field array holding all the field options - */ - - function load_field( $field ) { - - // remove name to avoid caching issue - $field['name'] = ''; - - // remove required to avoid JS issues - $field['required'] = 0; - - // set value other than 'null' to avoid ACF loading / caching issue - $field['value'] = false; - - // return - return $field; - - } - -} + class acf_field__accordion extends acf_field { -// initialize -acf_register_field_type( 'acf_field__accordion' ); + /** + * initialize + * + * This function will setup the field type data + * + * @date 30/10/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function initialize() { + + // vars + $this->name = 'accordion'; + $this->label = __( 'Accordion', 'acf' ); + $this->category = 'layout'; + $this->defaults = array( + 'open' => 0, + 'multi_expand' => 0, + 'endpoint' => 0, + ); + + } + + + /** + * render_field + * + * Create the HTML interface for your field + * + * @date 30/10/17 + * @since 5.6.3 + * + * @param array $field + * @return n/a + */ + + function render_field( $field ) { + + // vars + $atts = array( + 'class' => 'acf-fields', + 'data-open' => $field['open'], + 'data-multi_expand' => $field['multi_expand'], + 'data-endpoint' => $field['endpoint'], + ); + + ?> +>
+ ' . __( 'Accordions help you organize fields into panels that open and close.', 'acf') . '';
+ $message .= '' . __( 'All fields following this accordion (or until another accordion is defined) will be grouped together.','acf') . '
'; + + + // default_value + acf_render_field_setting( $field, array( + 'label' => __('Instructions','acf'), + 'instructions' => '', + 'name' => 'notes', + 'type' => 'message', + 'message' => $message, + )); + */ + + // active + acf_render_field_setting( + $field, + array( + 'label' => __( 'Open', 'acf' ), + 'instructions' => __( 'Display this accordion as open on page load.', 'acf' ), + 'name' => 'open', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + // multi_expand + acf_render_field_setting( + $field, + array( + 'label' => __( 'Multi-expand', 'acf' ), + 'instructions' => __( 'Allow this accordion to open without closing others.', 'acf' ), + 'name' => 'multi_expand', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + // endpoint + acf_render_field_setting( + $field, + array( + 'label' => __( 'Endpoint', 'acf' ), + 'instructions' => __( 'Define an endpoint for the previous accordion to stop. This accordion will not be visible.', 'acf' ), + 'name' => 'endpoint', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + } + + + /* + * load_field() + * + * This filter is appied to the $field after it is loaded from the database + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $field - the field array holding all the field options + * + * @return $field - the field array holding all the field options + */ + + function load_field( $field ) { + + // remove name to avoid caching issue + $field['name'] = ''; + + // remove required to avoid JS issues + $field['required'] = 0; + + // set value other than 'null' to avoid ACF loading / caching issue + $field['value'] = false; + + // return + return $field; + + } + + } + + + // initialize + acf_register_field_type( 'acf_field__accordion' ); endif; // class_exists check -?> \ No newline at end of file +?> diff --git a/includes/fields/class-acf-field-button-group.php b/includes/fields/class-acf-field-button-group.php index db1dd95..1c08337 100644 --- a/includes/fields/class-acf-field-button-group.php +++ b/includes/fields/class-acf-field-button-group.php @@ -1,292 +1,299 @@ name = 'button_group'; - $this->label = __("Button Group",'acf'); - $this->category = 'choice'; - $this->defaults = array( - 'choices' => array(), - 'default_value' => '', - 'allow_null' => 0, - 'return_format' => 'value', - 'layout' => 'horizontal', - ); - - } - - - /** - * render_field() - * - * Creates the field's input HTML - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param array $field The field settings array - * @return n/a - */ - - function render_field( $field ) { - - // vars - $html = ''; - $selected = null; - $buttons = array(); - $value = esc_attr( $field['value'] ); - - - // bail ealrly if no choices - if( empty($field['choices']) ) return; - - - // buttons - foreach( $field['choices'] as $_value => $_label ) { - - // checked - $checked = ( $value === esc_attr($_value) ); - if( $checked ) $selected = true; - - - // append - $buttons[] = array( - 'name' => $field['name'], - 'value' => $_value, - 'label' => $_label, - 'checked' => $checked + class acf_field_button_group extends acf_field { + + + /** + * initialize() + * + * This function will setup the field type data + * + * @date 18/9/17 + * @since 5.6.3 + * + * @param n/a + * @return n/a + */ + + function initialize() { + + // vars + $this->name = 'button_group'; + $this->label = __( 'Button Group', 'acf' ); + $this->category = 'choice'; + $this->defaults = array( + 'choices' => array(), + 'default_value' => '', + 'allow_null' => 0, + 'return_format' => 'value', + 'layout' => 'horizontal', ); - + } - - - // maybe select initial value - if( !$field['allow_null'] && $selected === null ) { - $buttons[0]['checked'] = true; - } - - - // div - $div = array( 'class' => 'acf-button-group' ); - - if( $field['layout'] == 'vertical' ) { $div['class'] .= ' -vertical'; } - if( $field['class'] ) { $div['class'] .= ' ' . $field['class']; } - if( $field['allow_null'] ) { $div['data-allow_null'] = 1; } - - - // hdden input - $html .= acf_get_hidden_input( array('name' => $field['name']) ); - - - // open - $html .= '';
-
- // loop
- foreach( $buttons as $button ) {
-
+
+
+ /**
+ * render_field()
+ *
+ * Creates the field's input HTML
+ *
+ * @date 18/9/17
+ * @since 5.6.3
+ *
+ * @param array $field The field settings array
+ * @return n/a
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $html = '';
+ $selected = null;
+ $buttons = array();
+ $value = esc_attr( $field['value'] );
+
+ // bail ealrly if no choices
+ if ( empty( $field['choices'] ) ) {
+ return;
+ }
+
+ // buttons
+ foreach ( $field['choices'] as $_value => $_label ) {
+
// checked
- if( $button['checked'] ) {
+ $checked = ( $value === esc_attr( $_value ) );
+ if ( $checked ) {
+ $selected = true;
+ }
+
+ // append
+ $buttons[] = array(
+ 'name' => $field['name'],
+ 'value' => $_value,
+ 'label' => $_label,
+ 'checked' => $checked,
+ );
+
+ }
+
+ // maybe select initial value
+ if ( ! $field['allow_null'] && $selected === null ) {
+ $buttons[0]['checked'] = true;
+ }
+
+ // div
+ $div = array( 'class' => 'acf-button-group' );
+
+ if ( $field['layout'] == 'vertical' ) {
+ $div['class'] .= ' -vertical'; }
+ if ( $field['class'] ) {
+ $div['class'] .= ' ' . $field['class']; }
+ if ( $field['allow_null'] ) {
+ $div['data-allow_null'] = 1; }
+
+ // hdden input
+ $html .= acf_get_hidden_input( array( 'name' => $field['name'] ) );
+
+ // open
+ $html .= '
' . __('For more control, you may specify both a value and label like this:','acf'). '
' . __('red : Red','acf'), - 'type' => 'textarea', - 'name' => 'choices', - )); - - - // allow_null - acf_render_field_setting( $field, array( - 'label' => __('Allow Null?','acf'), - 'instructions' => '', - 'name' => 'allow_null', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // default_value - acf_render_field_setting( $field, array( - 'label' => __('Default Value','acf'), - 'instructions' => __('Appears when creating a new post','acf'), - 'type' => 'text', - 'name' => 'default_value', - )); - - - // layout - acf_render_field_setting( $field, array( - 'label' => __('Layout','acf'), - 'instructions' => '', - 'type' => 'radio', - 'name' => 'layout', - 'layout' => 'horizontal', - 'choices' => array( - 'horizontal' => __("Horizontal",'acf'), - 'vertical' => __("Vertical",'acf'), - ) - )); - - - // return_format - 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( - 'value' => __('Value','acf'), - 'label' => __('Label','acf'), - 'array' => __('Both (Array)','acf') - ) - )); - - } - - - /* - * update_field() - * - * This filter is appied to the $field before it is saved to the database - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param array $field The field array holding all the field options - * @return $field - */ - function update_field( $field ) { - - return acf_get_field_type('radio')->update_field( $field ); - } - - - /* - * load_value() - * - * This filter is appied to the $value after it is loaded from the db - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param mixed $value The value found in the database - * @param mixed $post_id The post ID from which the value was loaded from - * @param array $field The field array holding all the field options - * @return $value - */ - - function load_value( $value, $post_id, $field ) { - - return acf_get_field_type('radio')->load_value( $value, $post_id, $field ); - - } - - - /* - * translate_field - * - * This function will translate field settings - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param array $field The field array holding all the field options - * @return $field - */ - - function translate_field( $field ) { - - return acf_get_field_type('radio')->translate_field( $field ); - - } - - - /* - * format_value() - * - * This filter is appied to the $value after it is loaded from the db and before it is returned to the template - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param mixed $value The value found in the database - * @param mixed $post_id The post ID from which the value was loaded from - * @param array $field The field array holding all the field options - * @return $value - */ - - function format_value( $value, $post_id, $field ) { - - return acf_get_field_type('radio')->format_value( $value, $post_id, $field ); - - } - -} + // close + $html .= '
';
+
+ // return
+ echo $html;
+
+ }
-// initialize
-acf_register_field_type( 'acf_field_button_group' );
+ /**
+ * render_field_settings()
+ *
+ * Creates the field's settings HTML
+ *
+ * @date 18/9/17
+ * @since 5.6.3
+ *
+ * @param array $field The field settings array
+ * @return n/a
+ */
+
+ function render_field_settings( $field ) {
+
+ // encode choices (convert from array)
+ $field['choices'] = acf_encode_choices( $field['choices'] );
+
+ // choices
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Choices', 'acf' ),
+ 'instructions' => __( 'Enter each choice on a new line.', 'acf' ) . '';
+
+ // loop
+ foreach ( $buttons as $button ) {
+
+ // checked
+ if ( $button['checked'] ) {
$button['checked'] = 'checked';
} else {
- unset($button['checked']);
+ unset( $button['checked'] );
}
-
-
+
// append
$html .= acf_get_radio_input( $button );
-
+
}
-
-
- // close
- $html .= '
';
-
-
- // return
- echo $html;
-
- }
-
-
- /**
- * render_field_settings()
- *
- * Creates the field's settings HTML
- *
- * @date 18/9/17
- * @since 5.6.3
- *
- * @param array $field The field settings array
- * @return n/a
- */
-
- function render_field_settings( $field ) {
-
- // encode choices (convert from array)
- $field['choices'] = acf_encode_choices($field['choices']);
-
-
- // choices
- acf_render_field_setting( $field, array(
- 'label' => __('Choices','acf'),
- 'instructions' => __('Enter each choice on a new line.','acf') . '' . __('For more control, you may specify both a value and label like this:','acf'). '
' . __('red : Red','acf'), - 'type' => 'textarea', - 'name' => 'choices', - )); - - - // allow_null - acf_render_field_setting( $field, array( - 'label' => __('Allow Null?','acf'), - 'instructions' => '', - 'name' => 'allow_null', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // default_value - acf_render_field_setting( $field, array( - 'label' => __('Default Value','acf'), - 'instructions' => __('Appears when creating a new post','acf'), - 'type' => 'text', - 'name' => 'default_value', - )); - - - // layout - acf_render_field_setting( $field, array( - 'label' => __('Layout','acf'), - 'instructions' => '', - 'type' => 'radio', - 'name' => 'layout', - 'layout' => 'horizontal', - 'choices' => array( - 'horizontal' => __("Horizontal",'acf'), - 'vertical' => __("Vertical",'acf'), - ) - )); - - - // return_format - 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( - 'value' => __('Value','acf'), - 'label' => __('Label','acf'), - 'array' => __('Both (Array)','acf') - ) - )); - - } - - - /* - * update_field() - * - * This filter is appied to the $field before it is saved to the database - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param array $field The field array holding all the field options - * @return $field - */ - function update_field( $field ) { - - return acf_get_field_type('radio')->update_field( $field ); - } - - - /* - * load_value() - * - * This filter is appied to the $value after it is loaded from the db - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param mixed $value The value found in the database - * @param mixed $post_id The post ID from which the value was loaded from - * @param array $field The field array holding all the field options - * @return $value - */ - - function load_value( $value, $post_id, $field ) { - - return acf_get_field_type('radio')->load_value( $value, $post_id, $field ); - - } - - - /* - * translate_field - * - * This function will translate field settings - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param array $field The field array holding all the field options - * @return $field - */ - - function translate_field( $field ) { - - return acf_get_field_type('radio')->translate_field( $field ); - - } - - - /* - * format_value() - * - * This filter is appied to the $value after it is loaded from the db and before it is returned to the template - * - * @date 18/9/17 - * @since 5.6.3 - * - * @param mixed $value The value found in the database - * @param mixed $post_id The post ID from which the value was loaded from - * @param array $field The field array holding all the field options - * @return $value - */ - - function format_value( $value, $post_id, $field ) { - - return acf_get_field_type('radio')->format_value( $value, $post_id, $field ); - - } - -} + // close + $html .= '
' . __( 'For more control, you may specify both a value and label like this:', 'acf' ) . '
' . __( 'red : Red', 'acf' ), + 'type' => 'textarea', + 'name' => 'choices', + ) + ); + + // allow_null + acf_render_field_setting( + $field, + array( + 'label' => __( 'Allow Null?', 'acf' ), + 'instructions' => '', + 'name' => 'allow_null', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + // default_value + acf_render_field_setting( + $field, + array( + 'label' => __( 'Default Value', 'acf' ), + 'instructions' => __( 'Appears when creating a new post', 'acf' ), + 'type' => 'text', + 'name' => 'default_value', + ) + ); + + // layout + acf_render_field_setting( + $field, + array( + 'label' => __( 'Layout', 'acf' ), + 'instructions' => '', + 'type' => 'radio', + 'name' => 'layout', + 'layout' => 'horizontal', + 'choices' => array( + 'horizontal' => __( 'Horizontal', 'acf' ), + 'vertical' => __( 'Vertical', 'acf' ), + ), + ) + ); + + // return_format + 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( + 'value' => __( 'Value', 'acf' ), + 'label' => __( 'Label', 'acf' ), + 'array' => __( 'Both (Array)', 'acf' ), + ), + ) + ); + + } + + + /* + * update_field() + * + * This filter is appied to the $field before it is saved to the database + * + * @date 18/9/17 + * @since 5.6.3 + * + * @param array $field The field array holding all the field options + * @return $field + */ + + function update_field( $field ) { + + return acf_get_field_type( 'radio' )->update_field( $field ); + } + + + /* + * load_value() + * + * This filter is appied to the $value after it is loaded from the db + * + * @date 18/9/17 + * @since 5.6.3 + * + * @param mixed $value The value found in the database + * @param mixed $post_id The post ID from which the value was loaded from + * @param array $field The field array holding all the field options + * @return $value + */ + + function load_value( $value, $post_id, $field ) { + + return acf_get_field_type( 'radio' )->load_value( $value, $post_id, $field ); + + } + + + /* + * translate_field + * + * This function will translate field settings + * + * @date 18/9/17 + * @since 5.6.3 + * + * @param array $field The field array holding all the field options + * @return $field + */ + + function translate_field( $field ) { + + return acf_get_field_type( 'radio' )->translate_field( $field ); + + } + + + /* + * format_value() + * + * This filter is appied to the $value after it is loaded from the db and before it is returned to the template + * + * @date 18/9/17 + * @since 5.6.3 + * + * @param mixed $value The value found in the database + * @param mixed $post_id The post ID from which the value was loaded from + * @param array $field The field array holding all the field options + * @return $value + */ + + function format_value( $value, $post_id, $field ) { + + return acf_get_field_type( 'radio' )->format_value( $value, $post_id, $field ); + + } + + } + + + // initialize + acf_register_field_type( 'acf_field_button_group' ); endif; // class_exists check -?> \ No newline at end of file + diff --git a/includes/fields/class-acf-field-checkbox.php b/includes/fields/class-acf-field-checkbox.php index b47b889..a167244 100644 --- a/includes/fields/class-acf-field-checkbox.php +++ b/includes/fields/class-acf-field-checkbox.php @@ -1,585 +1,575 @@ name = 'checkbox'; - $this->label = __("Checkbox",'acf'); - $this->category = 'choice'; - $this->defaults = array( - 'layout' => 'vertical', - 'choices' => array(), - 'default_value' => '', - 'allow_custom' => 0, - 'save_custom' => 0, - 'toggle' => 0, - 'return_format' => 'value' - ); - - } - - - /* - * render_field() - * - * Create the HTML interface for your field - * - * @param $field (array) the $field being rendered - * - * @type action - * @since 3.6 - * @date 23/01/13 - * - * @param $field (array) the $field being edited - * @return n/a - */ - - function render_field( $field ) { - - // reset vars - $this->_values = array(); - $this->_all_checked = true; - - - // ensure array - $field['value'] = acf_get_array($field['value']); - $field['choices'] = acf_get_array($field['choices']); - - - // hiden input - acf_hidden_input( array('name' => $field['name']) ); - - - // vars - $li = ''; - $ul = array( - 'class' => 'acf-checkbox-list', - ); - - - // append to class - $ul['class'] .= ' ' . ($field['layout'] == 'horizontal' ? 'acf-hl' : 'acf-bl'); - $ul['class'] .= ' ' . $field['class']; - - - // checkbox saves an array - $field['name'] .= '[]'; - - - // choices - if( !empty($field['choices']) ) { - - // choices - $li .= $this->render_field_choices( $field ); - - - // toggle - if( $field['toggle'] ) { - $li = $this->render_field_toggle( $field ) . $li; - } - - } - - - // custom - if( $field['allow_custom'] ) { - $li .= $this->render_field_custom( $field ); - } - - - // return - echo '
- ' . "\n" . $li . '
' . __('For more control, you may specify both a value and label like this:','acf'). '
' . __('red : Red','acf'), - 'type' => 'textarea', - 'name' => 'choices', - )); - - - // other_choice - acf_render_field_setting( $field, array( - 'label' => __('Allow Custom','acf'), - 'instructions' => '', - 'name' => 'allow_custom', - 'type' => 'true_false', - 'ui' => 1, - 'message' => __("Allow 'custom' values to be added", 'acf'), - )); - - - // save_other_choice - acf_render_field_setting( $field, array( - 'label' => __('Save Custom','acf'), - 'instructions' => '', - 'name' => 'save_custom', - 'type' => 'true_false', - 'ui' => 1, - 'message' => __("Save 'custom' values to the field's choices", 'acf'), - 'conditions' => array( - 'field' => 'allow_custom', - 'operator' => '==', - 'value' => 1 - ) - )); - - - // default_value - 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'), - 'instructions' => '', - 'type' => 'radio', - 'name' => 'layout', - 'layout' => 'horizontal', - 'choices' => array( - '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'), - 'name' => 'toggle', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // return_format - 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( - 'value' => __('Value','acf'), - 'label' => __('Label','acf'), - 'array' => __('Both (Array)','acf') - ) - )); - - } - - - /* - * update_field() - * - * This filter is appied to the $field before it is saved to the database - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $field - the field array holding all the field options - * @param $post_id - the field group ID (post_type = acf) - * - * @return $field - the modified field - */ - function update_field( $field ) { - - // Decode choices (convert to array). - $field['choices'] = acf_decode_choices( $field['choices'] ); - $field['default_value'] = acf_decode_choices( $field['default_value'], true ); - return $field; - } - - - /* - * update_value() - * - * This filter is appied to the $value before it is updated in the db - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $value - the value which will be saved in the database - * @param $post_id - the $post_id of which the value will be saved - * @param $field - the field array holding all the field options - * - * @return $value - the modified value - */ - - function update_value( $value, $post_id, $field ) { - - // bail early if is empty - if( empty($value) ) return $value; - - - // select -> update_value() - $value = acf_get_field_type('select')->update_value( $value, $post_id, $field ); - - - // save_other_choice - if( $field['save_custom'] ) { - - // get raw $field (may have been changed via repeater field) - // if field is local, it won't have an ID - $selector = $field['ID'] ? $field['ID'] : $field['key']; - $field = acf_get_field( $selector ); - if( !$field ) { - return false; + } + + + /* + * render_field() + * + * Create the HTML interface for your field + * + * @param $field (array) the $field being rendered + * + * @type action + * @since 3.6 + * @date 23/01/13 + * + * @param $field (array) the $field being edited + * @return n/a + */ + + function render_field( $field ) { + + // reset vars + $this->_values = array(); + $this->_all_checked = true; + + // ensure array + $field['value'] = acf_get_array( $field['value'] ); + $field['choices'] = acf_get_array( $field['choices'] ); + + // hiden input + acf_hidden_input( array( 'name' => $field['name'] ) ); + + // vars + $li = ''; + $ul = array( + 'class' => 'acf-checkbox-list', + ); + + // append to class + $ul['class'] .= ' ' . ( $field['layout'] == 'horizontal' ? 'acf-hl' : 'acf-bl' ); + $ul['class'] .= ' ' . $field['class']; + + // checkbox saves an array + $field['name'] .= '[]'; + + // choices + if ( ! empty( $field['choices'] ) ) { + + // choices + $li .= $this->render_field_choices( $field ); + + // toggle + if ( $field['toggle'] ) { + $li = $this->render_field_toggle( $field ) . $li; + } } - - - // bail early if no ID (JSON only) - if( !$field['ID'] ) return $value; - - + + // custom + if ( $field['allow_custom'] ) { + $li .= $this->render_field_custom( $field ); + } + + // return + echo '
- ' . "\n" . $li . '
' . __( 'For more control, you may specify both a value and label like this:', 'acf' ) . '
' . __( 'red : Red', 'acf' ), + 'type' => 'textarea', + 'name' => 'choices', + ) + ); + + // other_choice + acf_render_field_setting( + $field, + array( + 'label' => __( 'Allow Custom', 'acf' ), + 'instructions' => '', + 'name' => 'allow_custom', + 'type' => 'true_false', + 'ui' => 1, + 'message' => __( "Allow 'custom' values to be added", 'acf' ), + ) + ); + + // save_other_choice + acf_render_field_setting( + $field, + array( + 'label' => __( 'Save Custom', 'acf' ), + 'instructions' => '', + 'name' => 'save_custom', + 'type' => 'true_false', + 'ui' => 1, + 'message' => __( "Save 'custom' values to the field's choices", 'acf' ), + 'conditions' => array( + 'field' => 'allow_custom', + 'operator' => '==', + 'value' => 1, + ), + ) + ); + + // default_value + 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' ), + 'instructions' => '', + 'type' => 'radio', + 'name' => 'layout', + 'layout' => 'horizontal', + 'choices' => array( + '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' ), + 'name' => 'toggle', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + // return_format + 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( + 'value' => __( 'Value', 'acf' ), + 'label' => __( 'Label', 'acf' ), + 'array' => __( 'Both (Array)', 'acf' ), + ), + ) + ); + + } + + + /* + * update_field() + * + * This filter is appied to the $field before it is saved to the database + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $field - the field array holding all the field options + * @param $post_id - the field group ID (post_type = acf) + * + * @return $field - the modified field + */ + + function update_field( $field ) { + + // Decode choices (convert to array). + $field['choices'] = acf_decode_choices( $field['choices'] ); + $field['default_value'] = acf_decode_choices( $field['default_value'], true ); + return $field; + } + + + /* + * update_value() + * + * This filter is appied to the $value before it is updated in the db + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $value - the value which will be saved in the database + * @param $post_id - the $post_id of which the value will be saved + * @param $field - the field array holding all the field options + * + * @return $value - the modified value + */ + + function update_value( $value, $post_id, $field ) { + + // bail early if is empty + if ( empty( $value ) ) { + return $value; + } + + // select -> update_value() + $value = acf_get_field_type( 'select' )->update_value( $value, $post_id, $field ); + + // save_other_choice + if ( $field['save_custom'] ) { + + // get raw $field (may have been changed via repeater field) + // if field is local, it won't have an ID + $selector = $field['ID'] ? $field['ID'] : $field['key']; + $field = acf_get_field( $selector ); + if ( ! $field ) { + return false; + } + + // bail early if no ID (JSON only) + if ( ! $field['ID'] ) { + return $value; + } + + // loop + foreach ( $value as $v ) { + + // ignore if already eixsts + if ( isset( $field['choices'][ $v ] ) ) { + continue; + } + + // unslash (fixes serialize single quote issue) + $v = wp_unslash( $v ); + + // sanitize (remove tags) + $v = sanitize_text_field( $v ); + + // append + $field['choices'][ $v ] = $v; + + } + + // save + acf_update_field( $field ); + + } + + // return + return $value; + + } + + + /* + * translate_field + * + * This function will translate field settings + * + * @type function + * @date 8/03/2016 + * @since 5.3.2 + * + * @param $field (array) + * @return $field + */ + + function translate_field( $field ) { + + return acf_get_field_type( 'select' )->translate_field( $field ); + + } + + + /* + * format_value() + * + * This filter is appied to the $value after it is loaded from the db and before it is returned to the template + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $value (mixed) the value which was loaded from the database + * @param $post_id (mixed) the $post_id from which the value was loaded + * @param $field (array) the field array holding all the field options + * + * @return $value (mixed) the modified value + */ + + function format_value( $value, $post_id, $field ) { + + // Bail early if is empty. + if ( acf_is_empty( $value ) ) { + return array(); + } + + // Always convert to array of items. + $value = acf_array( $value ); + + // Return. + return acf_get_field_type( 'select' )->format_value( $value, $post_id, $field ); + } + } - -} -// initialize -acf_register_field_type( 'acf_field_checkbox' ); + // initialize + acf_register_field_type( 'acf_field_checkbox' ); endif; // class_exists check -?> \ No newline at end of file + diff --git a/includes/fields/class-acf-field-color_picker.php b/includes/fields/class-acf-field-color_picker.php index 9b4fcc6..4ffa555 100644 --- a/includes/fields/class-acf-field-color_picker.php +++ b/includes/fields/class-acf-field-color_picker.php @@ -1,144 +1,296 @@ name = 'color_picker'; - $this->label = __("Color Picker",'acf'); - $this->category = 'jquery'; - $this->defaults = array( - 'default_value' => '', - ); - - } - - - /* - * input_admin_enqueue_scripts - * - * description - * - * @type function - * @date 16/12/2015 - * @since 5.3.2 - * - * @param $post_id (int) - * @return $post_id (int) - */ - - function input_admin_enqueue_scripts() { + class acf_field_color_picker extends acf_field { + + + /* + * __construct + * + * This function will setup the field type data + * + * @type function + * @date 5/03/2014 + * @since 5.0.0 + * + * @param n/a + * @return n/a + */ + + function initialize() { + + // vars + $this->name = 'color_picker'; + $this->label = __( 'Color Picker', 'acf' ); + $this->category = 'jquery'; + $this->defaults = array( + 'default_value' => '', + 'enable_opacity' => false, + 'return_format' => 'string', // 'string'|'array' + ); - // Register scripts for non-admin. - // Applies logic from wp_default_scripts() function defined in "wp-includes/script-loader.php". - if( !is_admin() ) { - $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; - $scripts = wp_scripts(); - $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 ); - $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 ); - - // Handle localisation across multiple WP versions. - // WP 5.0+ - if( method_exists($scripts, 'set_translations') ) { - $scripts->set_translations( 'wp-color-picker' ); - // WP 4.9 - } else { - $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array( - 'clear' => __( 'Clear' ), - 'clearAriaLabel' => __( 'Clear color' ), - 'defaultString' => __( 'Default' ), - 'defaultAriaLabel' => __( 'Select default color' ), - 'pick' => __( 'Select Color' ), - 'defaultLabel' => __( 'Color value' ), - )); - } - } - - // Enqueue. - wp_enqueue_style( 'wp-color-picker' ); - wp_enqueue_script( 'wp-color-picker' ); - } - - - /* - * render_field() - * - * Create the HTML interface for your field - * - * @param $field - an array holding all the field's data - * - * @type action - * @since 3.6 - * @date 23/01/13 - */ - - function render_field( $field ) { - - // vars - $text_input = acf_get_sub_array( $field, array('id', 'class', 'name', 'value') ); - $hidden_input = acf_get_sub_array( $field, array('name', 'value') ); - - - // html - ?> + + + /* + * input_admin_enqueue_scripts + * + * description + * + * @type function + * @date 16/12/2015 + * @since 5.3.2 + * + * @param $post_id (int) + * @return $post_id (int) + */ + + function input_admin_enqueue_scripts() { + + // Register scripts for non-admin. + // Applies logic from wp_default_scripts() function defined in "wp-includes/script-loader.php". + if ( ! is_admin() ) { + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + $scripts = wp_scripts(); + $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 ); + $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 ); + + // Handle localisation across multiple WP versions. + // WP 5.0+ + if ( method_exists( $scripts, 'set_translations' ) ) { + $scripts->set_translations( 'wp-color-picker' ); + // WP 4.9 + } else { + $scripts->localize( + 'wp-color-picker', + 'wpColorPickerL10n', + array( + 'clear' => __( 'Clear' ), + 'clearAriaLabel' => __( 'Clear color' ), + 'defaultString' => __( 'Default' ), + 'defaultAriaLabel' => __( 'Select default color' ), + 'pick' => __( 'Select Color' ), + 'defaultLabel' => __( 'Color value' ), + ) + ); + } + } + + // Enqueue alpha color picker assets. + wp_enqueue_script( + 'acf-color-picker-alpha', + acf_get_url( 'assets/inc/color-picker-alpha/wp-color-picker-alpha.js' ), + array( 'jquery', 'wp-color-picker' ), + '3.0.0' + ); + + // Enqueue. + wp_enqueue_style( 'wp-color-picker' ); + wp_enqueue_script( 'wp-color-picker' ); + + acf_localize_data( + array( + 'colorPickerL10n' => array( + 'hex_string' => __( 'Hex String', 'acf' ), + 'rgba_string' => __( 'RGBA String', 'acf' ), + ), + ) + ); + } + + + /* + * render_field() + * + * Create the HTML interface for your field + * + * @param $field - an array holding all the field's data + * + * @type action + * @since 3.6 + * @date 23/01/13 + */ + + function render_field( $field ) { + + // vars + $text_input = acf_get_sub_array( $field, array( 'id', 'class', 'name', 'value' ) ); + $hidden_input = acf_get_sub_array( $field, array( 'name', 'value' ) ); + + // Color picker alpha library requires a specific data attribute to exist. + if ( $field['enable_opacity'] ) { + $text_input['data-alpha-enabled'] = true; + } + + // html + ?>
>
- __('Display Format','acf'),
- 'instructions' => __('The format displayed when editing a post','acf'),
- 'type' => 'radio',
- 'name' => 'display_format',
- 'other_choice' => 1,
- 'choices' => array(
- 'd/m/Y' => '' . $d_m_Y . 'd/m/Y',
- 'm/d/Y' => '' . $m_d_Y . 'm/d/Y',
- 'F j, Y' => '' . $F_j_Y . 'F j, Y',
- 'other' => '' . __('Custom:','acf') . ''
- )
- ));
-
-
- // save_format - compatibility with ACF < 5.0.0
- if( !empty($field['save_format']) ) {
-
- // save_format
- acf_render_field_setting( $field, array(
- 'label' => __('Save Format','acf'),
- 'instructions' => __('The format used when saving a value','acf'),
- 'type' => 'text',
- 'name' => 'save_format',
- //'readonly' => 1 // this setting was not readonly in v4
- ));
-
- } else {
-
- // return_format
- 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,
- 'choices' => array(
- 'd/m/Y' => '' . $d_m_Y . 'd/m/Y',
- 'm/d/Y' => '' . $m_d_Y . 'm/d/Y',
- 'F j, Y' => '' . $F_j_Y . 'F j, Y',
- 'Ymd' => '' . $Ymd . 'Ymd',
- 'other' => '' . __('Custom:','acf') . ''
+ __( 'Display Format', 'acf' ),
+ 'instructions' => __( 'The format displayed when editing a post', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'display_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'd/m/Y' => '' . $d_m_Y . 'd/m/Y',
+ 'm/d/Y' => '' . $m_d_Y . 'm/d/Y',
+ 'F j, Y' => '' . $F_j_Y . 'F j, Y',
+ 'other' => '' . __( 'Custom:', 'acf' ) . '',
+ ),
)
- ));
-
+ );
+
+ // save_format - compatibility with ACF < 5.0.0
+ if ( ! empty( $field['save_format'] ) ) {
+
+ // save_format
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Save Format', 'acf' ),
+ 'instructions' => __( 'The format used when saving a value', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'save_format',
+ // 'readonly' => 1 // this setting was not readonly in v4
+ )
+ );
+
+ } else {
+
+ // return_format
+ 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,
+ 'choices' => array(
+ 'd/m/Y' => '' . $d_m_Y . 'd/m/Y',
+ 'm/d/Y' => '' . $m_d_Y . 'm/d/Y',
+ 'F j, Y' => '' . $F_j_Y . 'F j, Y',
+ 'Ymd' => '' . $Ymd . 'Ymd',
+ 'other' => '' . __( 'Custom:', 'acf' ) . '',
+ ),
+ )
+ );
+
+ }
+
+ // first_day
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Week Starts On', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'first_day',
+ 'choices' => array_values( $wp_locale->weekday ),
+ )
+ );
+
}
-
-
- // first_day
- acf_render_field_setting( $field, array(
- 'label' => __('Week Starts On','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'first_day',
- 'choices' => array_values( $wp_locale->weekday )
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // save_format - compatibility with ACF < 5.0.0
- if( !empty($field['save_format']) ) {
-
- return $value;
-
- }
-
-
- // return
- return acf_format_date( $value, $field['return_format'] );
-
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field_date_picker' );
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // save_format - compatibility with ACF < 5.0.0
+ if ( ! empty( $field['save_format'] ) ) {
+
+ return $value;
+
+ }
+
+ // return
+ return acf_format_date( $value, $field['return_format'] );
+
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_date_picker' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-date_time_picker.php b/includes/fields/class-acf-field-date_time_picker.php
index 4113955..33801b7 100644
--- a/includes/fields/class-acf-field-date_time_picker.php
+++ b/includes/fields/class-acf-field-date_time_picker.php
@@ -1,255 +1,261 @@
name = 'date_time_picker';
- $this->label = __("Date Time Picker",'acf');
- $this->category = 'jquery';
- $this->defaults = array(
- 'display_format' => 'd/m/Y g:i a',
- 'return_format' => 'd/m/Y g:i a',
- 'first_day' => 1
- );
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // bail ealry if no enqueue
- if( !acf_get_setting('enqueue_datetimepicker') ) return;
-
-
- // vars
- $version = '1.6.1';
-
-
- // script
- wp_enqueue_script('acf-timepicker', acf_get_url('assets/inc/timepicker/jquery-ui-timepicker-addon.min.js'), array('jquery-ui-datepicker'), $version);
-
-
- // style
- wp_enqueue_style('acf-timepicker', acf_get_url('assets/inc/timepicker/jquery-ui-timepicker-addon.min.css'), '', $version);
-
- // localize
- acf_localize_data(array(
- 'dateTimePickerL10n' => array(
- 'timeOnlyTitle' => _x('Choose Time', 'Date Time Picker JS timeOnlyTitle', 'acf'),
- 'timeText' => _x('Time', 'Date Time Picker JS timeText', 'acf'),
- 'hourText' => _x('Hour', 'Date Time Picker JS hourText', 'acf'),
- 'minuteText' => _x('Minute', 'Date Time Picker JS minuteText', 'acf'),
- 'secondText' => _x('Second', 'Date Time Picker JS secondText', 'acf'),
- 'millisecText' => _x('Millisecond', 'Date Time Picker JS millisecText', 'acf'),
- 'microsecText' => _x('Microsecond', 'Date Time Picker JS microsecText', 'acf'),
- 'timezoneText' => _x('Time Zone', 'Date Time Picker JS timezoneText', 'acf'),
- 'currentText' => _x('Now', 'Date Time Picker JS currentText', 'acf'),
- 'closeText' => _x('Done', 'Date Time Picker JS closeText', 'acf'),
- 'selectText' => _x('Select', 'Date Time Picker JS selectText', 'acf'),
- 'amNames' => array(
- _x('AM', 'Date Time Picker JS amText', 'acf'),
- _x('A', 'Date Time Picker JS amTextShort', 'acf'),
- ),
- 'pmNames' => array(
- _x('PM', 'Date Time Picker JS pmText', 'acf'),
- _x('P', 'Date Time Picker JS pmTextShort', 'acf'),
- )
- )
- ));
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // Set value.
- $hidden_value = '';
- $display_value = '';
-
- if( $field['value'] ) {
- $hidden_value = acf_format_date( $field['value'], 'Y-m-d H:i:s' );
- $display_value = acf_format_date( $field['value'], $field['display_format'] );
+ class acf_field_date_and_time_picker extends acf_field {
+
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'date_time_picker';
+ $this->label = __( 'Date Time Picker', 'acf' );
+ $this->category = 'jquery';
+ $this->defaults = array(
+ 'display_format' => 'd/m/Y g:i a',
+ 'return_format' => 'd/m/Y g:i a',
+ 'first_day' => 1,
+ );
}
-
- // Convert "display_format" setting to individual date and time formats.
- $formats = acf_split_date_time( $field['display_format'] );
-
- // Elements.
- $div = array(
- 'class' => 'acf-date-time-picker acf-input-wrap',
- 'data-date_format' => acf_convert_date_to_js($formats['date']),
- 'data-time_format' => acf_convert_time_to_js($formats['time']),
- 'data-first_day' => $field['first_day'],
- );
- $hidden_input = array(
- 'id' => $field['id'],
- 'class' => 'input-alt',
- 'name' => $field['name'],
- 'value' => $hidden_value,
- );
- $text_input = array(
- 'class' => 'input',
- 'value' => $display_value,
- );
- foreach( array( 'readonly', 'disabled' ) as $k ) {
- if( !empty($field[ $k ]) ) {
- $hidden_input[ $k ] = $k;
- $text_input[ $k ] = $k;
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // bail ealry if no enqueue
+ if ( ! acf_get_setting( 'enqueue_datetimepicker' ) ) {
+ return;
}
+
+ // vars
+ $version = '1.6.1';
+
+ // script
+ wp_enqueue_script( 'acf-timepicker', acf_get_url( 'assets/inc/timepicker/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-datepicker' ), $version );
+
+ // style
+ wp_enqueue_style( 'acf-timepicker', acf_get_url( 'assets/inc/timepicker/jquery-ui-timepicker-addon.min.css' ), '', $version );
+
+ // localize
+ acf_localize_data(
+ array(
+ 'dateTimePickerL10n' => array(
+ 'timeOnlyTitle' => _x( 'Choose Time', 'Date Time Picker JS timeOnlyTitle', 'acf' ),
+ 'timeText' => _x( 'Time', 'Date Time Picker JS timeText', 'acf' ),
+ 'hourText' => _x( 'Hour', 'Date Time Picker JS hourText', 'acf' ),
+ 'minuteText' => _x( 'Minute', 'Date Time Picker JS minuteText', 'acf' ),
+ 'secondText' => _x( 'Second', 'Date Time Picker JS secondText', 'acf' ),
+ 'millisecText' => _x( 'Millisecond', 'Date Time Picker JS millisecText', 'acf' ),
+ 'microsecText' => _x( 'Microsecond', 'Date Time Picker JS microsecText', 'acf' ),
+ 'timezoneText' => _x( 'Time Zone', 'Date Time Picker JS timezoneText', 'acf' ),
+ 'currentText' => _x( 'Now', 'Date Time Picker JS currentText', 'acf' ),
+ 'closeText' => _x( 'Done', 'Date Time Picker JS closeText', 'acf' ),
+ 'selectText' => _x( 'Select', 'Date Time Picker JS selectText', 'acf' ),
+ 'amNames' => array(
+ _x( 'AM', 'Date Time Picker JS amText', 'acf' ),
+ _x( 'A', 'Date Time Picker JS amTextShort', 'acf' ),
+ ),
+ 'pmNames' => array(
+ _x( 'PM', 'Date Time Picker JS pmText', 'acf' ),
+ _x( 'P', 'Date Time Picker JS pmTextShort', 'acf' ),
+ ),
+ ),
+ )
+ );
}
-
- // Output.
- ?>
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // Set value.
+ $hidden_value = '';
+ $display_value = '';
+
+ if ( $field['value'] ) {
+ $hidden_value = acf_format_date( $field['value'], 'Y-m-d H:i:s' );
+ $display_value = acf_format_date( $field['value'], $field['display_format'] );
+ }
+
+ // Convert "display_format" setting to individual date and time formats.
+ $formats = acf_split_date_time( $field['display_format'] );
+
+ // Elements.
+ $div = array(
+ 'class' => 'acf-date-time-picker acf-input-wrap',
+ 'data-date_format' => acf_convert_date_to_js( $formats['date'] ),
+ 'data-time_format' => acf_convert_time_to_js( $formats['time'] ),
+ 'data-first_day' => $field['first_day'],
+ );
+ $hidden_input = array(
+ 'id' => $field['id'],
+ 'class' => 'input-alt',
+ 'name' => $field['name'],
+ 'value' => $hidden_value,
+ );
+ $text_input = array(
+ 'class' => 'input',
+ 'value' => $display_value,
+ );
+ foreach ( array( 'readonly', 'disabled' ) as $k ) {
+ if ( ! empty( $field[ $k ] ) ) {
+ $hidden_input[ $k ] = $k;
+ $text_input[ $k ] = $k;
+ }
+ }
+
+ // Output.
+ ?>
>
- __('Display Format','acf'),
- 'instructions' => __('The format displayed when editing a post','acf'),
- 'type' => 'radio',
- 'name' => 'display_format',
- 'other_choice' => 1,
- 'choices' => array(
- 'd/m/Y g:i a' => '' . $d_m_Y . 'd/m/Y g:i a',
- 'm/d/Y g:i a' => '' . $m_d_Y . 'm/d/Y g:i a',
- 'F j, Y g:i a' => '' . $F_j_Y . 'F j, Y g:i a',
- 'Y-m-d H:i:s' => '' . $Ymd . 'Y-m-d H:i:s',
- 'other' => '' . __('Custom:','acf') . ''
- )
- ));
-
-
- // return_format
- 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,
- 'choices' => array(
- 'd/m/Y g:i a' => '' . $d_m_Y . 'd/m/Y g:i a',
- 'm/d/Y g:i a' => '' . $m_d_Y . 'm/d/Y g:i a',
- 'F j, Y g:i a' => '' . $F_j_Y . 'F j, Y g:i a',
- 'Y-m-d H:i:s' => '' . $Ymd . 'Y-m-d H:i:s',
- 'other' => '' . __('Custom:','acf') . ''
- )
- ));
-
-
- // first_day
- acf_render_field_setting( $field, array(
- 'label' => __('Week Starts On','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'first_day',
- 'choices' => array_values( $wp_locale->weekday )
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- return acf_format_date( $value, $field['return_format'] );
-
- }
-
-}
+ __( 'Display Format', 'acf' ),
+ 'instructions' => __( 'The format displayed when editing a post', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'display_format',
+ 'other_choice' => 1,
+ 'choices' => array(
+ 'd/m/Y g:i a' => '' . $d_m_Y . 'd/m/Y g:i a',
+ 'm/d/Y g:i a' => '' . $m_d_Y . 'm/d/Y g:i a',
+ 'F j, Y g:i a' => '' . $F_j_Y . 'F j, Y g:i a',
+ 'Y-m-d H:i:s' => '' . $Ymd . 'Y-m-d H:i:s',
+ 'other' => '' . __( 'Custom:', 'acf' ) . '',
+ ),
+ )
+ );
+
+ // return_format
+ 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,
+ 'choices' => array(
+ 'd/m/Y g:i a' => '' . $d_m_Y . 'd/m/Y g:i a',
+ 'm/d/Y g:i a' => '' . $m_d_Y . 'm/d/Y g:i a',
+ 'F j, Y g:i a' => '' . $F_j_Y . 'F j, Y g:i a',
+ 'Y-m-d H:i:s' => '' . $Ymd . 'Y-m-d H:i:s',
+ 'other' => '' . __( 'Custom:', 'acf' ) . '',
+ ),
+ )
+ );
+
+ // first_day
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Week Starts On', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'first_day',
+ 'choices' => array_values( $wp_locale->weekday ),
+ )
+ );
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ return acf_format_date( $value, $field['return_format'] );
+
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_date_and_time_picker' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-email.php b/includes/fields/class-acf-field-email.php
index cce93a0..0fe4b65 100644
--- a/includes/fields/class-acf-field-email.php
+++ b/includes/fields/class-acf-field-email.php
@@ -1,183 +1,189 @@
name = 'email';
+ $this->label = __( 'Email', 'acf' );
+ $this->defaults = array(
+ 'default_value' => '',
+ 'placeholder' => '',
+ 'prepend' => '',
+ 'append' => '',
+ );
-class acf_field_email extends acf_field {
-
-
- /*
- * initialize
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'email';
- $this->label = __("Email",'acf');
- $this->defaults = array(
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => ''
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // vars
- $atts = array();
- $keys = array( 'type', 'id', 'class', 'name', 'value', 'placeholder', 'pattern' );
- $keys2 = array( 'readonly', 'disabled', 'required', 'multiple' );
- $html = '';
-
-
- // prepend
- if( $field['prepend'] !== '' ) {
-
- $field['class'] .= ' acf-is-prepended';
- $html .= '' . acf_esc_html($field['prepend']) . '
';
-
}
-
-
- // append
- if( $field['append'] !== '' ) {
-
- $field['class'] .= ' acf-is-appended';
- $html .= '' . acf_esc_html($field['append']) . '
';
-
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $atts = array();
+ $keys = array( 'type', 'id', 'class', 'name', 'value', 'placeholder', 'pattern' );
+ $keys2 = array( 'readonly', 'disabled', 'required', 'multiple' );
+ $html = '';
+
+ // prepend
+ if ( $field['prepend'] !== '' ) {
+
+ $field['class'] .= ' acf-is-prepended';
+ $html .= '' . acf_esc_html( $field['prepend'] ) . '
';
+
+ }
+
+ // append
+ if ( $field['append'] !== '' ) {
+
+ $field['class'] .= ' acf-is-appended';
+ $html .= '' . acf_esc_html( $field['append'] ) . '
';
+
+ }
+
+ // atts (value="123")
+ foreach ( $keys as $k ) {
+ if ( isset( $field[ $k ] ) ) {
+ $atts[ $k ] = $field[ $k ];
+ }
+ }
+
+ // atts2 (disabled="disabled")
+ foreach ( $keys2 as $k ) {
+ if ( ! empty( $field[ $k ] ) ) {
+ $atts[ $k ] = $k;
+ }
+ }
+
+ // remove empty atts
+ $atts = acf_clean_atts( $atts );
+
+ // render
+ $html .= '' . acf_get_text_input( $atts ) . '
';
+
+ // return
+ echo $html;
+
}
-
-
- // atts (value="123")
- foreach( $keys as $k ) {
- if( isset($field[ $k ]) ) $atts[ $k ] = $field[ $k ];
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ 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' ),
+ 'type' => 'text',
+ 'name' => 'default_value',
+ )
+ );
+
+ // placeholder
+ 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' ),
+ 'type' => 'text',
+ 'name' => 'prepend',
+ )
+ );
+
+ // append
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Append', 'acf' ),
+ 'instructions' => __( 'Appears after the input', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'append',
+ )
+ );
+
}
-
-
- // atts2 (disabled="disabled")
- foreach( $keys2 as $k ) {
- if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
+
+ /**
+ * Validate the email value. If this method returns TRUE, the input value is valid. If
+ * FALSE or a string is returned, the input value is invalid and the user is shown a
+ * notice. If a string is returned, the string is show as the message text.
+ *
+ * @param bool $valid Whether the value is valid.
+ * @param mixed $value The field value.
+ * @param array $field The field array.
+ * @param string $input The request variable name for the inbound field.
+ *
+ * @return bool|string
+ */
+ public function validate_value( $valid, $value, $field, $input ) {
+ $flags = defined( 'FILTER_FLAG_EMAIL_UNICODE' ) ? FILTER_FLAG_EMAIL_UNICODE : 0;
+
+ if ( $value && filter_var( wp_unslash( $value ), FILTER_VALIDATE_EMAIL, $flags ) === false ) {
+ return sprintf( __( "'%s' is not a valid email address", 'acf' ), esc_html( $value ) );
+ }
+
+ return $valid;
}
-
-
- // remove empty atts
- $atts = acf_clean_atts( $atts );
-
-
- // render
- $html .= '' . acf_get_text_input( $atts ) . '
';
-
-
- // return
- echo $html;
-
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- 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'),
- 'type' => 'text',
- 'name' => 'default_value',
- ));
-
-
- // placeholder
- 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'),
- 'type' => 'text',
- 'name' => 'prepend',
- ));
-
-
- // append
- acf_render_field_setting( $field, array(
- 'label' => __('Append','acf'),
- 'instructions' => __('Appears after the input','acf'),
- 'type' => 'text',
- 'name' => 'append',
- ));
}
- /**
- * Validate the email value. If this method returns TRUE, the input value is valid. If
- * FALSE or a string is returned, the input value is invalid and the user is shown a
- * notice. If a string is returned, the string is show as the message text.
- *
- * @param bool $valid Whether the value is valid.
- * @param mixed $value The field value.
- * @param array $field The field array.
- * @param string $input The request variable name for the inbound field.
- *
- * @return bool|string
- */
- public function validate_value( $valid, $value, $field, $input ) {
- $flags = defined( 'FILTER_FLAG_EMAIL_UNICODE' ) ? FILTER_FLAG_EMAIL_UNICODE : 0;
- if ( $value && filter_var( wp_unslash($value), FILTER_VALIDATE_EMAIL, $flags ) === false ) {
- return sprintf( __( "'%s' is not a valid email address", 'acf' ), esc_html( $value ) );
- }
-
- return $valid;
- }
-
-}
-
-
-// initialize
-acf_register_field_type( 'acf_field_email' );
+ // initialize
+ acf_register_field_type( 'acf_field_email' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-file.php b/includes/fields/class-acf-field-file.php
index bee1a06..311081d 100644
--- a/includes/fields/class-acf-field-file.php
+++ b/includes/fields/class-acf-field-file.php
@@ -1,437 +1,460 @@
name = 'file';
- $this->label = __("File",'acf');
- $this->category = 'content';
- $this->defaults = array(
- 'return_format' => 'array',
- 'library' => 'all',
- 'min_size' => 0,
- 'max_size' => 0,
- 'mime_types' => ''
- );
-
- // filters
- add_filter('get_media_item_args', array($this, 'get_media_item_args'));
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // localize
- acf_localize_text(array(
- 'Select File' => __('Select File', 'acf'),
- 'Edit File' => __('Edit File', 'acf'),
- 'Update File' => __('Update File', 'acf'),
- ));
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // vars
- $uploader = acf_get_setting('uploader');
-
-
- // allow custom uploader
- $uploader = acf_maybe_get($field, 'uploader', $uploader);
-
-
- // enqueue
- if( $uploader == 'wp' ) {
- acf_enqueue_uploader();
+ class acf_field_file extends acf_field {
+
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'file';
+ $this->label = __( 'File', 'acf' );
+ $this->category = 'content';
+ $this->defaults = array(
+ 'return_format' => 'array',
+ 'library' => 'all',
+ 'min_size' => 0,
+ 'max_size' => 0,
+ 'mime_types' => '',
+ );
+
+ // filters
+ add_filter( 'get_media_item_args', array( $this, 'get_media_item_args' ) );
}
-
-
- // vars
- $o = array(
- 'icon' => '',
- 'title' => '',
- 'url' => '',
- 'filename' => '',
- 'filesize' => ''
- );
-
- $div = array(
- 'class' => 'acf-file-uploader',
- 'data-library' => $field['library'],
- 'data-mime_types' => $field['mime_types'],
- 'data-uploader' => $uploader
- );
-
-
- // has value?
- if( $field['value'] ) {
-
- $attachment = acf_get_attachment($field['value']);
- if( $attachment ) {
-
- // has value
- $div['class'] .= ' has-value';
-
- // update
- $o['icon'] = $attachment['icon'];
- $o['title'] = $attachment['title'];
- $o['url'] = $attachment['url'];
- $o['filename'] = $attachment['filename'];
- if( $attachment['filesize'] ) {
- $o['filesize'] = size_format($attachment['filesize']);
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // localize
+ acf_localize_text(
+ array(
+ 'Select File' => __( 'Select File', 'acf' ),
+ 'Edit File' => __( 'Edit File', 'acf' ),
+ 'Update File' => __( 'Update File', 'acf' ),
+ )
+ );
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $uploader = acf_get_setting( 'uploader' );
+
+ // allow custom uploader
+ $uploader = acf_maybe_get( $field, 'uploader', $uploader );
+
+ // enqueue
+ if ( $uploader == 'wp' ) {
+ acf_enqueue_uploader();
+ }
+
+ // vars
+ $o = array(
+ 'icon' => '',
+ 'title' => '',
+ 'url' => '',
+ 'filename' => '',
+ 'filesize' => '',
+ );
+
+ $div = array(
+ 'class' => 'acf-file-uploader',
+ 'data-library' => $field['library'],
+ 'data-mime_types' => $field['mime_types'],
+ 'data-uploader' => $uploader,
+ );
+
+ // has value?
+ if ( $field['value'] ) {
+
+ $attachment = acf_get_attachment( $field['value'] );
+ if ( $attachment ) {
+
+ // has value
+ $div['class'] .= ' has-value';
+
+ // update
+ $o['icon'] = $attachment['icon'];
+ $o['title'] = $attachment['title'];
+ $o['url'] = $attachment['url'];
+ $o['filename'] = $attachment['filename'];
+ if ( $attachment['filesize'] ) {
+ $o['filesize'] = size_format( $attachment['filesize'] );
+ }
}
- }
- }
-
-?>
+ }
+
+ ?>
>
- $field['name'], 'value' => $field['value'], 'data-name' => 'id' )); ?>
+ $field['name'],
+ 'value' => $field['value'],
+ 'data-name' => 'id',
+ )
+ );
+ ?>
- __( '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' ),
+ ),
+ )
+ );
+
+ // library
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Library', 'acf' ),
+ 'instructions' => __( 'Limit the media library choice', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'library',
+ 'layout' => 'horizontal',
+ 'choices' => array(
+ 'all' => __( 'All', 'acf' ),
+ 'uploadedTo' => __( 'Uploaded to post', 'acf' ),
+ ),
+ )
+ );
+
+ // min
+ 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' ),
+ 'append' => 'MB',
+ )
+ );
+
+ // max
+ 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' ),
+ 'append' => 'MB',
+ )
+ );
+
+ // allowed type
+ 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',
+ )
+ );
+
}
-
-
- // return_format
- 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')
- )
- ));
-
-
- // library
- acf_render_field_setting( $field, array(
- 'label' => __('Library','acf'),
- 'instructions' => __('Limit the media library choice','acf'),
- 'type' => 'radio',
- 'name' => 'library',
- 'layout' => 'horizontal',
- 'choices' => array(
- 'all' => __('All', 'acf'),
- 'uploadedTo' => __('Uploaded to post', 'acf')
- )
- ));
-
-
- // min
- 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'),
- 'append' => 'MB',
- ));
-
-
- // max
- 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'),
- 'append' => 'MB',
- ));
-
-
- // allowed type
- 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',
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) return false;
-
-
- // bail early if not numeric (error message)
- if( !is_numeric($value) ) return false;
-
-
- // convert to int
- $value = intval($value);
-
-
- // format
- if( $field['return_format'] == 'url' ) {
-
- return wp_get_attachment_url($value);
-
- } elseif( $field['return_format'] == 'array' ) {
-
- return acf_get_attachment( $value );
- }
-
-
- // return
- return $value;
- }
-
-
- /*
- * get_media_item_args
- *
- * description
- *
- * @type function
- * @date 27/01/13
- * @since 3.6.0
- *
- * @param $vars (array)
- * @return $vars
- */
-
- function get_media_item_args( $vars ) {
-
- $vars['send'] = true;
- return($vars);
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $post_id - the $post_id of which the value will be saved
- * @param $field - the field array holding all the field options
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // Bail early if no value.
- if( empty($value) ) {
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return false;
+ }
+
+ // bail early if not numeric (error message)
+ if ( ! is_numeric( $value ) ) {
+ return false;
+ }
+
+ // convert to int
+ $value = intval( $value );
+
+ // format
+ if ( $field['return_format'] == 'url' ) {
+
+ return wp_get_attachment_url( $value );
+
+ } elseif ( $field['return_format'] == 'array' ) {
+
+ return acf_get_attachment( $value );
+ }
+
+ // return
return $value;
}
-
- // Parse value for id.
- $attachment_id = acf_idval( $value );
-
- // Connect attacment to post.
- acf_connect_attachment_to_post( $attachment_id, $post_id );
-
- // Return id.
- return $attachment_id;
- }
-
-
-
- /*
- * validate_value
- *
- * This function will validate a basic file input
- *
- * @type function
- * @date 11/02/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function validate_value( $valid, $value, $field, $input ){
-
- // bail early if empty
- if( empty($value) ) return $valid;
-
-
- // bail ealry if is numeric
- if( is_numeric($value) ) return $valid;
-
-
- // bail ealry if not basic string
- if( !is_string($value) ) return $valid;
-
-
- // decode value
- $file = null;
- parse_str($value, $file);
-
-
- // bail early if no attachment
- if( empty($file) ) return $valid;
-
-
- // get errors
- $errors = acf_validate_attachment( $file, $field, 'basic_upload' );
-
-
- // append error
- if( !empty($errors) ) {
-
- $valid = implode("\n", $errors);
-
+
+
+ /*
+ * get_media_item_args
+ *
+ * description
+ *
+ * @type function
+ * @date 27/01/13
+ * @since 3.6.0
+ *
+ * @param $vars (array)
+ * @return $vars
+ */
+
+ function get_media_item_args( $vars ) {
+
+ $vars['send'] = true;
+ return( $vars );
+
}
-
-
- // return
- return $valid;
-
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // Bail early if no value.
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // Parse value for id.
+ $attachment_id = acf_idval( $value );
+
+ // Connect attacment to post.
+ acf_connect_attachment_to_post( $attachment_id, $post_id );
+
+ // Return id.
+ return $attachment_id;
+ }
+
+
+
+ /*
+ * validate_value
+ *
+ * This function will validate a basic file input
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ // bail early if empty
+ if ( empty( $value ) ) {
+ return $valid;
+ }
+
+ // bail ealry if is numeric
+ if ( is_numeric( $value ) ) {
+ return $valid;
+ }
+
+ // bail ealry if not basic string
+ if ( ! is_string( $value ) ) {
+ return $valid;
+ }
+
+ // decode value
+ $file = null;
+ parse_str( $value, $file );
+
+ // bail early if no attachment
+ if ( empty( $file ) ) {
+ return $valid;
+ }
+
+ // get errors
+ $errors = acf_validate_attachment( $file, $field, 'basic_upload' );
+
+ // append error
+ if ( ! empty( $errors ) ) {
+
+ $valid = implode( "\n", $errors );
+
+ }
+
+ // return
+ return $valid;
+
+ }
+
}
-
-}
-// initialize
-acf_register_field_type( 'acf_field_file' );
+ // initialize
+ acf_register_field_type( 'acf_field_file' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-google-map.php b/includes/fields/class-acf-field-google-map.php
index 3cb2599..3697ece 100644
--- a/includes/fields/class-acf-field-google-map.php
+++ b/includes/fields/class-acf-field-google-map.php
@@ -1,291 +1,312 @@
name = 'google_map';
- $this->label = __("Google Map",'acf');
- $this->category = 'jquery';
- $this->defaults = array(
- 'height' => '',
- 'center_lat' => '',
- 'center_lng' => '',
- 'zoom' => ''
- );
- $this->default_values = array(
- 'height' => '400',
- 'center_lat' => '-37.81411',
- 'center_lng' => '144.96328',
- 'zoom' => '14'
- );
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // localize
- acf_localize_text(array(
- 'Sorry, this browser does not support geolocation' => __('Sorry, this browser does not support geolocation', 'acf'),
- ));
-
-
- // bail ealry if no enqueue
- if( !acf_get_setting('enqueue_google_maps') ) {
- return;
- }
-
-
- // vars
- $api = array(
- 'key' => acf_get_setting('google_api_key'),
- 'client' => acf_get_setting('google_api_client'),
- 'libraries' => 'places',
- 'ver' => 3,
- 'callback' => '',
- 'language' => acf_get_locale()
- );
-
-
- // filter
- $api = apply_filters('acf/fields/google_map/api', $api);
-
-
- // remove empty
- if( empty($api['key']) ) unset($api['key']);
- if( empty($api['client']) ) unset($api['client']);
-
-
- // construct url
- $url = add_query_arg($api, 'https://maps.googleapis.com/maps/api/js');
-
-
- // localize
- acf_localize_data(array(
- 'google_map_api' => $url
- ));
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // Apply defaults.
- foreach( $this->default_values as $k => $v ) {
- if( !$field[ $k ] ) {
- $field[ $k ] = $v;
- }
+ class acf_field_google_map extends acf_field {
+
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'google_map';
+ $this->label = __( 'Google Map', 'acf' );
+ $this->category = 'jquery';
+ $this->defaults = array(
+ 'height' => '',
+ 'center_lat' => '',
+ 'center_lng' => '',
+ 'zoom' => '',
+ );
+ $this->default_values = array(
+ 'height' => '400',
+ 'center_lat' => '-37.81411',
+ 'center_lng' => '144.96328',
+ 'zoom' => '14',
+ );
}
-
- // Attrs.
- $attrs = array(
- 'id' => $field['id'],
- 'class' => "acf-google-map {$field['class']}",
- 'data-lat' => $field['center_lat'],
- 'data-lng' => $field['center_lng'],
- 'data-zoom' => $field['zoom'],
- );
-
- $search = '';
- if( $field['value'] ) {
- $attrs['class'] .= ' -value';
- $search = $field['value']['address'];
- } else {
- $field['value'] = '';
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // localize
+ acf_localize_text(
+ array(
+ 'Sorry, this browser does not support geolocation' => __( 'Sorry, this browser does not support geolocation', 'acf' ),
+ )
+ );
+
+ // bail ealry if no enqueue
+ if ( ! acf_get_setting( 'enqueue_google_maps' ) ) {
+ return;
+ }
+
+ // vars
+ $api = array(
+ 'key' => acf_get_setting( 'google_api_key' ),
+ 'client' => acf_get_setting( 'google_api_client' ),
+ 'libraries' => 'places',
+ 'ver' => 3,
+ 'callback' => '',
+ 'language' => acf_get_locale(),
+ );
+
+ // filter
+ $api = apply_filters( 'acf/fields/google_map/api', $api );
+
+ // remove empty
+ if ( empty( $api['key'] ) ) {
+ unset( $api['key'] );
+ }
+ if ( empty( $api['client'] ) ) {
+ unset( $api['client'] );
+ }
+
+ // construct url
+ $url = add_query_arg( $api, 'https://maps.googleapis.com/maps/api/js' );
+
+ // localize
+ acf_localize_data(
+ array(
+ 'google_map_api' => $url,
+ )
+ );
}
-
-?>
->
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // Apply defaults.
+ foreach ( $this->default_values as $k => $v ) {
+ if ( ! $field[ $k ] ) {
+ $field[ $k ] = $v;
+ }
+ }
+
+ // Attrs.
+ $attrs = array(
+ 'id' => $field['id'],
+ 'class' => "acf-google-map {$field['class']}",
+ 'data-lat' => $field['center_lat'],
+ 'data-lng' => $field['center_lng'],
+ 'data-zoom' => $field['zoom'],
+ );
+
+ $search = '';
+ if ( $field['value'] ) {
+ $attrs['class'] .= ' -value';
+ $search = $field['value']['address'];
+ } else {
+ $field['value'] = '';
+ }
+
+ ?>
+
- $field['sub_fields'],
- 'parent' => $field['ID']
- );
-
-
- ?>
+ $field['sub_fields'],
+ 'parent' => $field['ID'],
+ );
+
+ ?>
+
-
+
-
- __('Layout','acf'),
- 'instructions' => __('Specify the style used to render the selected fields', 'acf'),
- 'type' => 'radio',
- 'name' => 'layout',
- 'layout' => 'horizontal',
- 'choices' => array(
- 'block' => __('Block','acf'),
- 'table' => __('Table','acf'),
- 'row' => __('Row','acf')
- )
- ));
-
- }
-
-
- /*
- * validate_value
- *
- * description
- *
- * @type function
- * @date 11/02/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function validate_value( $valid, $value, $field, $input ){
-
- // bail early if no $value
- if( empty($value) ) return $valid;
-
-
- // bail early if no sub fields
- if( empty($field['sub_fields']) ) return $valid;
-
-
- // loop
- foreach( $field['sub_fields'] as $sub_field ) {
-
- // get sub field
- $k = $sub_field['key'];
-
-
- // bail early if value not set (conditional logic?)
- if( !isset($value[ $k ]) ) continue;
-
-
- // required
- if( $field['required'] ) {
- $sub_field['required'] = 1;
- }
-
-
- // validate
- acf_validate_value( $value[ $k ], $sub_field, "{$input}[{$k}]" );
-
- }
-
-
- // return
- return $valid;
-
- }
-
-
- /*
- * duplicate_field()
- *
- * This filter is appied to the $field before it is duplicated and saved to the database
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - the field array holding all the field options
- *
- * @return $field - the modified field
- */
+ __( 'Layout', 'acf' ),
+ 'instructions' => __( 'Specify the style used to render the selected fields', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'layout',
+ 'layout' => 'horizontal',
+ 'choices' => array(
+ 'block' => __( 'Block', 'acf' ),
+ 'table' => __( 'Table', 'acf' ),
+ 'row' => __( 'Row', 'acf' ),
+ ),
+ )
+ );
- function duplicate_field( $field ) {
-
- // get sub fields
- $sub_fields = acf_extract_var( $field, 'sub_fields' );
-
-
- // save field to get ID
- $field = acf_update_field( $field );
-
-
- // duplicate sub fields
- acf_duplicate_fields( $sub_fields, $field['ID'] );
-
-
- // return
- return $field;
-
- }
-
- /**
- * prepare_field_for_export
- *
- * Prepares the field for export.
- *
- * @date 11/03/2014
- * @since 5.0.0
- *
- * @param array $field The field settings.
- * @return array
- */
- function prepare_field_for_export( $field ) {
-
- // Check for sub fields.
- if( !empty($field['sub_fields']) ) {
- $field['sub_fields'] = acf_prepare_fields_for_export( $field['sub_fields'] );
}
- return $field;
- }
-
- /**
- * prepare_field_for_import
- *
- * Returns a flat array of fields containing all sub fields ready for import.
- *
- * @date 11/03/2014
- * @since 5.0.0
- *
- * @param array $field The field settings.
- * @return array
- */
- function prepare_field_for_import( $field ) {
-
- // Check for sub fields.
- if( !empty($field['sub_fields']) ) {
+
+
+ /*
+ * validate_value
+ *
+ * description
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ // bail early if no $value
+ if ( empty( $value ) ) {
+ return $valid;
+ }
+
+ // bail early if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return $valid;
+ }
+
+ // loop
+ foreach ( $field['sub_fields'] as $sub_field ) {
+
+ // get sub field
+ $k = $sub_field['key'];
+
+ // bail early if value not set (conditional logic?)
+ if ( ! isset( $value[ $k ] ) ) {
+ continue;
+ }
+
+ // required
+ if ( $field['required'] ) {
+ $sub_field['required'] = 1;
+ }
+
+ // validate
+ acf_validate_value( $value[ $k ], $sub_field, "{$input}[{$k}]" );
+
+ }
+
+ // return
+ return $valid;
+
+ }
+
+
+ /*
+ * duplicate_field()
+ *
+ * This filter is appied to the $field before it is duplicated and saved to the database
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - the field array holding all the field options
+ *
+ * @return $field - the modified field
+ */
+
+ function duplicate_field( $field ) {
+
+ // get sub fields
$sub_fields = acf_extract_var( $field, 'sub_fields' );
-
- // Modify sub fields.
- foreach( $sub_fields as $i => $sub_field ) {
- $sub_fields[ $i ]['parent'] = $field['key'];
- $sub_fields[ $i ]['menu_order'] = $i;
+
+ // save field to get ID
+ $field = acf_update_field( $field );
+
+ // duplicate sub fields
+ acf_duplicate_fields( $sub_fields, $field['ID'] );
+
+ // return
+ return $field;
+
+ }
+
+ /**
+ * prepare_field_for_export
+ *
+ * Prepares the field for export.
+ *
+ * @date 11/03/2014
+ * @since 5.0.0
+ *
+ * @param array $field The field settings.
+ * @return array
+ */
+ function prepare_field_for_export( $field ) {
+
+ // Check for sub fields.
+ if ( ! empty( $field['sub_fields'] ) ) {
+ $field['sub_fields'] = acf_prepare_fields_for_export( $field['sub_fields'] );
}
-
- // Return array of [field, sub_1, sub_2, ...].
- return array_merge( array($field), $sub_fields );
-
+ return $field;
}
- return $field;
- }
-
-
- /*
- * delete_value
- *
- * Called when deleting this field's value.
- *
- * @date 1/07/2015
- * @since 5.2.3
- *
- * @param mixed $post_id The post ID being saved
- * @param string $meta_key The field name as seen by the DB
- * @param array $field The field settings
- * @return void
- */
-
- function delete_value( $post_id, $meta_key, $field ) {
-
- // bail ealry if no sub fields
- if( empty($field['sub_fields']) ) return null;
-
- // modify names
- $field = $this->prepare_field_for_db( $field );
-
- // loop
- foreach( $field['sub_fields'] as $sub_field ) {
- acf_delete_value( $post_id, $sub_field );
- }
- }
-
- /**
- * delete_field
- *
- * Called when deleting a field of this type.
- *
- * @date 8/11/18
- * @since 5.8.0
- *
- * @param arra $field The field settings.
- * @return void
- */
- function delete_field( $field ) {
-
- // loop over sub fields and delete them
- if( $field['sub_fields'] ) {
- foreach( $field['sub_fields'] as $sub_field ) {
- acf_delete_field( $sub_field['ID'] );
+
+ /**
+ * prepare_field_for_import
+ *
+ * Returns a flat array of fields containing all sub fields ready for import.
+ *
+ * @date 11/03/2014
+ * @since 5.0.0
+ *
+ * @param array $field The field settings.
+ * @return array
+ */
+ function prepare_field_for_import( $field ) {
+
+ // Check for sub fields.
+ if ( ! empty( $field['sub_fields'] ) ) {
+ $sub_fields = acf_extract_var( $field, 'sub_fields' );
+
+ // Modify sub fields.
+ foreach ( $sub_fields as $i => $sub_field ) {
+ $sub_fields[ $i ]['parent'] = $field['key'];
+ $sub_fields[ $i ]['menu_order'] = $i;
+ }
+
+ // Return array of [field, sub_1, sub_2, ...].
+ return array_merge( array( $field ), $sub_fields );
+
}
+ return $field;
}
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field__group' );
+ /*
+ * delete_value
+ *
+ * Called when deleting this field's value.
+ *
+ * @date 1/07/2015
+ * @since 5.2.3
+ *
+ * @param mixed $post_id The post ID being saved
+ * @param string $meta_key The field name as seen by the DB
+ * @param array $field The field settings
+ * @return void
+ */
+
+ function delete_value( $post_id, $meta_key, $field ) {
+
+ // bail ealry if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return null;
+ }
+
+ // modify names
+ $field = $this->prepare_field_for_db( $field );
+
+ // loop
+ foreach ( $field['sub_fields'] as $sub_field ) {
+ acf_delete_value( $post_id, $sub_field );
+ }
+ }
+
+ /**
+ * delete_field
+ *
+ * Called when deleting a field of this type.
+ *
+ * @date 8/11/18
+ * @since 5.8.0
+ *
+ * @param arra $field The field settings.
+ * @return void
+ */
+ function delete_field( $field ) {
+
+ // loop over sub fields and delete them
+ if ( $field['sub_fields'] ) {
+ foreach ( $field['sub_fields'] as $sub_field ) {
+ acf_delete_field( $sub_field['ID'] );
+ }
+ }
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field__group' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-image.php b/includes/fields/class-acf-field-image.php
index 5bc93c0..c0ecd06 100644
--- a/includes/fields/class-acf-field-image.php
+++ b/includes/fields/class-acf-field-image.php
@@ -1,419 +1,452 @@
name = 'image';
+ $this->label = __( 'Image', 'acf' );
+ $this->category = 'content';
+ $this->defaults = array(
+ 'return_format' => 'array',
+ 'preview_size' => 'medium',
+ 'library' => 'all',
+ 'min_width' => 0,
+ 'min_height' => 0,
+ 'min_size' => 0,
+ 'max_width' => 0,
+ 'max_height' => 0,
+ 'max_size' => 0,
+ 'mime_types' => '',
+ );
+
+ // filters
+ add_filter( 'get_media_item_args', array( $this, 'get_media_item_args' ) );
-class acf_field_image extends acf_field {
-
-
- /*
- * __construct
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'image';
- $this->label = __("Image",'acf');
- $this->category = 'content';
- $this->defaults = array(
- 'return_format' => 'array',
- 'preview_size' => 'medium',
- 'library' => 'all',
- 'min_width' => 0,
- 'min_height' => 0,
- 'min_size' => 0,
- 'max_width' => 0,
- 'max_height' => 0,
- 'max_size' => 0,
- 'mime_types' => ''
- );
-
- // filters
- add_filter('get_media_item_args', array($this, 'get_media_item_args'));
-
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // localize
- acf_localize_text(array(
- 'Select Image' => __('Select Image', 'acf'),
- 'Edit Image' => __('Edit Image', 'acf'),
- 'Update Image' => __('Update Image', 'acf'),
- 'All images' => __('All images', 'acf'),
- ));
- }
-
- /**
- * Renders the field HTML.
- *
- * @date 23/01/13
- * @since 3.6.0
- *
- * @param array $field The field settings.
- * @return void
- */
- function render_field( $field ) {
- $uploader = acf_get_setting('uploader');
-
- // Enqueue uploader scripts
- if( $uploader === 'wp' ) {
- acf_enqueue_uploader();
}
- // Elements and attributes.
- $value = '';
- $div_attrs = array(
- 'class' => 'acf-image-uploader',
- 'data-preview_size' => $field['preview_size'],
- 'data-library' => $field['library'],
- 'data-mime_types' => $field['mime_types'],
- 'data-uploader' => $uploader
- );
- $img_attrs = array(
- 'src' => '',
- 'alt' => '',
- 'data-name' => 'image'
- );
-
- // Detect value.
- if( $field['value'] && is_numeric($field['value']) ) {
- $image = wp_get_attachment_image_src( $field['value'], $field['preview_size'] );
- if( $image ) {
- $value = $field['value'];
- $img_attrs['src'] = $image[0];
- $img_attrs['alt'] = get_post_meta( $field['value'], '_wp_attachment_image_alt', true );
- $div_attrs['class'] .= ' has-value';
- }
- }
-
- // Add "preview size" max width and height style.
- // Apply max-width to wrap, and max-height to img for max compatibility with field widths.
- $size = acf_get_image_size( $field['preview_size'] );
- $size_w = $size['width'] ? $size['width'] . 'px' : '100%';
- $size_h = $size['height'] ? $size['height'] . 'px' : '100%';
- $img_attrs['style'] = sprintf( 'max-height: %s;', $size_h );
- // Render HTML.
- ?>
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // localize
+ acf_localize_text(
+ array(
+ 'Select Image' => __( 'Select Image', 'acf' ),
+ 'Edit Image' => __( 'Edit Image', 'acf' ),
+ 'Update Image' => __( 'Update Image', 'acf' ),
+ 'All images' => __( 'All images', 'acf' ),
+ )
+ );
+ }
+
+ /**
+ * Renders the field HTML.
+ *
+ * @date 23/01/13
+ * @since 3.6.0
+ *
+ * @param array $field The field settings.
+ * @return void
+ */
+ function render_field( $field ) {
+ $uploader = acf_get_setting( 'uploader' );
+
+ // Enqueue uploader scripts
+ if ( $uploader === 'wp' ) {
+ acf_enqueue_uploader();
+ }
+
+ // Elements and attributes.
+ $value = '';
+ $div_attrs = array(
+ 'class' => 'acf-image-uploader',
+ 'data-preview_size' => $field['preview_size'],
+ 'data-library' => $field['library'],
+ 'data-mime_types' => $field['mime_types'],
+ 'data-uploader' => $uploader,
+ );
+ $img_attrs = array(
+ 'src' => '',
+ 'alt' => '',
+ 'data-name' => 'image',
+ );
+
+ // Detect value.
+ if ( $field['value'] && is_numeric( $field['value'] ) ) {
+ $image = wp_get_attachment_image_src( $field['value'], $field['preview_size'] );
+ if ( $image ) {
+ $value = $field['value'];
+ $img_attrs['src'] = $image[0];
+ $img_attrs['alt'] = get_post_meta( $field['value'], '_wp_attachment_image_alt', true );
+ $div_attrs['class'] .= ' has-value';
+ }
+ }
+
+ // Add "preview size" max width and height style.
+ // Apply max-width to wrap, and max-height to img for max compatibility with field widths.
+ $size = acf_get_image_size( $field['preview_size'] );
+ $size_w = $size['width'] ? $size['width'] . 'px' : '100%';
+ $size_h = $size['height'] ? $size['height'] . 'px' : '100%';
+ $img_attrs['style'] = sprintf( 'max-height: %s;', $size_h );
+
+ // Render HTML.
+ ?>
>
- $field['name'], 'value' => $field['value']) ); ?>
+ $field['name'],
+ 'value' => $field['value'],
+ )
+ );
+ ?>
-
+
- __('Center','acf'),
- 'instructions' => __('Center the initial map','acf'),
- 'type' => 'text',
- 'name' => 'center_lat',
- 'prepend' => 'lat',
- 'placeholder' => $this->default_values['center_lat']
- ));
-
-
- // center_lng
- acf_render_field_setting( $field, array(
- 'label' => __('Center','acf'),
- 'instructions' => __('Center the initial map','acf'),
- 'type' => 'text',
- 'name' => 'center_lng',
- 'prepend' => 'lng',
- 'placeholder' => $this->default_values['center_lng'],
- '_append' => 'center_lat'
- ));
-
-
- // zoom
- 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']
- ));
-
-
- // allow_null
- acf_render_field_setting( $field, array(
- 'label' => __('Height','acf'),
- 'instructions' => __('Customize the map height','acf'),
- 'type' => 'text',
- 'name' => 'height',
- 'append' => 'px',
- 'placeholder' => $this->default_values['height']
- ));
-
- }
-
- /**
- * load_value
- *
- * Filters the value loaded from the database.
- *
- * @date 16/10/19
- * @since 5.8.1
- *
- * @param mixed $value The value loaded from the database.
- * @param mixed $post_id The post ID where the value is saved.
- * @param array $field The field settings array.
- * @return (array|false)
- */
- function load_value( $value, $post_id, $field ) {
-
- // Ensure value is an array.
- if( $value ) {
- return wp_parse_args($value, array(
- 'address' => '',
- 'lat' => 0,
- 'lng' => 0
- ));
+ __( 'Center', 'acf' ),
+ 'instructions' => __( 'Center the initial map', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'center_lat',
+ 'prepend' => 'lat',
+ 'placeholder' => $this->default_values['center_lat'],
+ )
+ );
+
+ // center_lng
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Center', 'acf' ),
+ 'instructions' => __( 'Center the initial map', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'center_lng',
+ 'prepend' => 'lng',
+ 'placeholder' => $this->default_values['center_lng'],
+ '_append' => 'center_lat',
+ )
+ );
+
+ // zoom
+ 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'],
+ )
+ );
+
+ // allow_null
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Height', 'acf' ),
+ 'instructions' => __( 'Customize the map height', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'height',
+ 'append' => 'px',
+ 'placeholder' => $this->default_values['height'],
+ )
+ );
+
+ }
+
+ /**
+ * load_value
+ *
+ * Filters the value loaded from the database.
+ *
+ * @date 16/10/19
+ * @since 5.8.1
+ *
+ * @param mixed $value The value loaded from the database.
+ * @param mixed $post_id The post ID where the value is saved.
+ * @param array $field The field settings array.
+ * @return (array|false)
+ */
+ function load_value( $value, $post_id, $field ) {
+
+ // Ensure value is an array.
+ if ( $value ) {
+ return wp_parse_args(
+ $value,
+ array(
+ 'address' => '',
+ 'lat' => 0,
+ 'lng' => 0,
+ )
+ );
+ }
+
+ // Return default.
+ return false;
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+ function update_value( $value, $post_id, $field ) {
+
+ // decode JSON string.
+ if ( is_string( $value ) ) {
+ $value = json_decode( wp_unslash( $value ), true );
+ }
+
+ // Ensure value is an array.
+ if ( $value ) {
+ return (array) $value;
+ }
+
+ // Return default.
+ return false;
+ }
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_google_map' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-group.php b/includes/fields/class-acf-field-group.php
index 13c7f04..c0e5a8d 100644
--- a/includes/fields/class-acf-field-group.php
+++ b/includes/fields/class-acf-field-group.php
@@ -1,682 +1,670 @@
name = 'group';
- $this->label = __("Group",'acf');
- $this->category = 'layout';
- $this->defaults = array(
- 'sub_fields' => array(),
- 'layout' => 'block'
- );
- $this->have_rows = 'single';
-
-
- // field filters
- $this->add_field_filter('acf/prepare_field_for_export', array($this, 'prepare_field_for_export'));
- $this->add_field_filter('acf/prepare_field_for_import', array($this, 'prepare_field_for_import'));
-
- }
-
-
- /*
- * load_field()
- *
- * This filter is appied to the $field after it is loaded from the database
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - the field array holding all the field options
- *
- * @return $field - the field array holding all the field options
- */
-
- function load_field( $field ) {
-
- // vars
- $sub_fields = acf_get_fields( $field );
-
-
- // append
- if( $sub_fields ) {
-
- $field['sub_fields'] = $sub_fields;
-
- }
-
-
- // return
- return $field;
-
- }
-
-
- /*
- * load_value()
- *
- * This filter is applied to the $value after it is loaded from the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value found in the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- * @return $value
- */
-
- function load_value( $value, $post_id, $field ) {
-
- // bail early if no sub fields
- if( empty($field['sub_fields']) ) return $value;
-
-
- // modify names
- $field = $this->prepare_field_for_db( $field );
-
-
- // load sub fields
- $value = array();
-
-
- // loop
- foreach( $field['sub_fields'] as $sub_field ) {
-
- // load
- $value[ $sub_field['key'] ] = acf_get_value( $post_id, $sub_field );
-
- }
-
-
- // return
- return $value;
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) return false;
-
-
- // modify names
- $field = $this->prepare_field_for_db( $field );
-
-
- // loop
- foreach( $field['sub_fields'] as $sub_field ) {
-
- // extract value
- $sub_value = acf_extract_var( $value, $sub_field['key'] );
-
-
- // format value
- $sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
-
-
- // append to $row
- $value[ $sub_field['_name'] ] = $sub_value;
-
- }
-
-
- // return
- return $value;
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $field - the field array holding all the field options
- * @param $post_id - the $post_id of which the value will be saved
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( !acf_is_array($value) ) return null;
-
-
- // bail ealry if no sub fields
- if( empty($field['sub_fields']) ) return null;
-
-
- // modify names
- $field = $this->prepare_field_for_db( $field );
-
-
- // loop
- foreach( $field['sub_fields'] as $sub_field ) {
-
// vars
- $v = false;
-
-
- // key (backend)
- if( isset($value[ $sub_field['key'] ]) ) {
-
- $v = $value[ $sub_field['key'] ];
-
- // name (frontend)
- } elseif( isset($value[ $sub_field['_name'] ]) ) {
-
- $v = $value[ $sub_field['_name'] ];
-
- // empty
- } else {
-
- // input is not set (hidden by conditioanl logic)
- continue;
-
- }
-
-
- // update value
- acf_update_value( $v, $post_id, $sub_field );
-
- }
-
-
- // return
- return '';
-
- }
-
-
- /*
- * prepare_field_for_db
- *
- * This function will modify sub fields ready for update / load
- *
- * @type function
- * @date 4/11/16
- * @since 5.5.0
- *
- * @param $field (array)
- * @return $field
- */
-
- function prepare_field_for_db( $field ) {
-
- // bail early if no sub fields
- if( empty($field['sub_fields']) ) return $field;
-
-
- // loop
- foreach( $field['sub_fields'] as &$sub_field ) {
-
- // prefix name
- $sub_field['name'] = $field['name'] . '_' . $sub_field['_name'];
-
- }
-
-
- // return
- return $field;
+ $this->name = 'group';
+ $this->label = __( 'Group', 'acf' );
+ $this->category = 'layout';
+ $this->defaults = array(
+ 'sub_fields' => array(),
+ 'layout' => 'block',
+ );
+ $this->have_rows = 'single';
+
+ // field filters
+ $this->add_field_filter( 'acf/prepare_field_for_export', array( $this, 'prepare_field_for_export' ) );
+ $this->add_field_filter( 'acf/prepare_field_for_import', array( $this, 'prepare_field_for_import' ) );
+
+ }
+
+
+ /*
+ * load_field()
+ *
+ * This filter is appied to the $field after it is loaded from the database
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - the field array holding all the field options
+ *
+ * @return $field - the field array holding all the field options
+ */
+
+ function load_field( $field ) {
+
+ // vars
+ $sub_fields = acf_get_fields( $field );
+
+ // append
+ if ( $sub_fields ) {
+
+ $field['sub_fields'] = $sub_fields;
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // bail early if no sub fields
- if( empty($field['sub_fields']) ) return;
-
-
- // load values
- foreach( $field['sub_fields'] as &$sub_field ) {
-
- // add value
- if( isset($field['value'][ $sub_field['key'] ]) ) {
-
- // this is a normal value
- $sub_field['value'] = $field['value'][ $sub_field['key'] ];
-
- } elseif( isset($sub_field['default_value']) ) {
-
- // no value, but this sub field has a default value
- $sub_field['value'] = $sub_field['default_value'];
-
}
-
-
- // update prefix to allow for nested values
- $sub_field['prefix'] = $field['name'];
-
-
- // restore required
- if( $field['required'] ) $sub_field['required'] = 0;
-
+
+ // return
+ return $field;
+
}
-
-
- // render
- if( $field['layout'] == 'table' ) {
-
- $this->render_field_table( $field );
-
- } else {
-
- $this->render_field_block( $field );
-
+
+
+ /*
+ * load_value()
+ *
+ * This filter is applied to the $value after it is loaded from the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value found in the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ * @return $value
+ */
+
+ function load_value( $value, $post_id, $field ) {
+
+ // bail early if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return $value;
+ }
+
+ // modify names
+ $field = $this->prepare_field_for_db( $field );
+
+ // load sub fields
+ $value = array();
+
+ // loop
+ foreach ( $field['sub_fields'] as $sub_field ) {
+
+ // load
+ $value[ $sub_field['key'] ] = acf_get_value( $post_id, $sub_field );
+
+ }
+
+ // return
+ return $value;
+
}
-
- }
-
-
- /*
- * render_field_block
- *
- * description
- *
- * @type function
- * @date 12/07/2016
- * @since 5.4.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function render_field_block( $field ) {
-
- // vars
- $label_placement = ($field['layout'] == 'block') ? 'top' : 'left';
-
-
- // html
- echo '';
-
- foreach( $field['sub_fields'] as $sub_field ) {
-
- acf_render_field_wrap( $sub_field );
-
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return false;
+ }
+
+ // modify names
+ $field = $this->prepare_field_for_db( $field );
+
+ // loop
+ foreach ( $field['sub_fields'] as $sub_field ) {
+
+ // extract value
+ $sub_value = acf_extract_var( $value, $sub_field['key'] );
+
+ // format value
+ $sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
+
+ // append to $row
+ $value[ $sub_field['_name'] ] = $sub_value;
+
+ }
+
+ // return
+ return $value;
+
}
-
- echo '
';
-
- }
-
-
- /*
- * render_field_table
- *
- * description
- *
- * @type function
- * @date 12/07/2016
- * @since 5.4.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function render_field_table( $field ) {
-
-?>
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $field - the field array holding all the field options
+ * @param $post_id - the $post_id of which the value will be saved
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( ! acf_is_array( $value ) ) {
+ return null;
+ }
+
+ // bail ealry if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return null;
+ }
+
+ // modify names
+ $field = $this->prepare_field_for_db( $field );
+
+ // loop
+ foreach ( $field['sub_fields'] as $sub_field ) {
+
+ // vars
+ $v = false;
+
+ // key (backend)
+ if ( isset( $value[ $sub_field['key'] ] ) ) {
+
+ $v = $value[ $sub_field['key'] ];
+
+ // name (frontend)
+ } elseif ( isset( $value[ $sub_field['_name'] ] ) ) {
+
+ $v = $value[ $sub_field['_name'] ];
+
+ // empty
+ } else {
+
+ // input is not set (hidden by conditioanl logic)
+ continue;
+
+ }
+
+ // update value
+ acf_update_value( $v, $post_id, $sub_field );
+
+ }
+
+ // return
+ return '';
+
+ }
+
+
+ /*
+ * prepare_field_for_db
+ *
+ * This function will modify sub fields ready for update / load
+ *
+ * @type function
+ * @date 4/11/16
+ * @since 5.5.0
+ *
+ * @param $field (array)
+ * @return $field
+ */
+
+ function prepare_field_for_db( $field ) {
+
+ // bail early if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return $field;
+ }
+
+ // loop
+ foreach ( $field['sub_fields'] as &$sub_field ) {
+
+ // prefix name
+ $sub_field['name'] = $field['name'] . '_' . $sub_field['_name'];
+
+ }
+
+ // return
+ return $field;
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // bail early if no sub fields
+ if ( empty( $field['sub_fields'] ) ) {
+ return;
+ }
+
+ // load values
+ foreach ( $field['sub_fields'] as &$sub_field ) {
+
+ // add value
+ if ( isset( $field['value'][ $sub_field['key'] ] ) ) {
+
+ // this is a normal value
+ $sub_field['value'] = $field['value'][ $sub_field['key'] ];
+
+ } elseif ( isset( $sub_field['default_value'] ) ) {
+
+ // no value, but this sub field has a default value
+ $sub_field['value'] = $sub_field['default_value'];
+
+ }
+
+ // update prefix to allow for nested values
+ $sub_field['prefix'] = $field['name'];
+
+ // restore required
+ if ( $field['required'] ) {
+ $sub_field['required'] = 0;
+ }
+ }
+
+ // render
+ if ( $field['layout'] == 'table' ) {
+
+ $this->render_field_table( $field );
+
+ } else {
+
+ $this->render_field_block( $field );
+
+ }
+
+ }
+
+
+ /*
+ * render_field_block
+ *
+ * description
+ *
+ * @type function
+ * @date 12/07/2016
+ * @since 5.4.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function render_field_block( $field ) {
+
+ // vars
+ $label_placement = ( $field['layout'] == 'block' ) ? 'top' : 'left';
+
+ // html
+ echo '';
+
+ foreach ( $field['sub_fields'] as $sub_field ) {
+
+ acf_render_field_wrap( $sub_field );
+
+ }
+
+ echo '
';
+
+ }
+
+
+ /*
+ * render_field_table
+ *
+ * description
+ *
+ * @type function
+ * @date 12/07/2016
+ * @since 5.4.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function render_field_table( $field ) {
+
+ ?>
| > | - +
|---|
>
- $field['name'],
- 'value' => $value
- )); ?>
+ $field['name'],
+ 'value' => $value,
+ )
+ );
+ ?>
- __( 'Return Format', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'layout' => 'horizontal',
+ 'choices' => array(
+ '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' => '',
+ 'type' => 'select',
+ 'name' => 'preview_size',
+ 'choices' => acf_get_image_sizes(),
+ )
+ );
+
+ // library
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Library', 'acf' ),
+ 'instructions' => __( 'Limit the media library choice', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'library',
+ 'layout' => 'horizontal',
+ 'choices' => array(
+ 'all' => __( 'All', 'acf' ),
+ 'uploadedTo' => __( 'Uploaded to post', 'acf' ),
+ ),
+ )
+ );
+
+ // min
+ 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(
+ 'label' => '',
+ 'type' => 'text',
+ 'name' => 'min_height',
+ 'prepend' => __( 'Height', 'acf' ),
+ 'append' => 'px',
+ '_append' => 'min_width',
+ )
+ );
+
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => '',
+ 'type' => 'text',
+ 'name' => 'min_size',
+ 'prepend' => __( 'File size', 'acf' ),
+ 'append' => 'MB',
+ '_append' => 'min_width',
+ )
+ );
+
+ // max
+ 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(
+ 'label' => '',
+ 'type' => 'text',
+ 'name' => 'max_height',
+ 'prepend' => __( 'Height', 'acf' ),
+ 'append' => 'px',
+ '_append' => 'max_width',
+ )
+ );
+
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => '',
+ 'type' => 'text',
+ 'name' => 'max_size',
+ 'prepend' => __( 'File size', 'acf' ),
+ 'append' => 'MB',
+ '_append' => 'max_width',
+ )
+ );
+
+ // allowed type
+ 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',
+ )
+ );
+
}
-
-
- // return_format
- acf_render_field_setting( $field, array(
- 'label' => __('Return Format','acf'),
- 'instructions' => '',
- 'type' => 'radio',
- 'name' => 'return_format',
- 'layout' => 'horizontal',
- 'choices' => array(
- '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' => '',
- 'type' => 'select',
- 'name' => 'preview_size',
- 'choices' => acf_get_image_sizes()
- ));
-
-
- // library
- acf_render_field_setting( $field, array(
- 'label' => __('Library','acf'),
- 'instructions' => __('Limit the media library choice','acf'),
- 'type' => 'radio',
- 'name' => 'library',
- 'layout' => 'horizontal',
- 'choices' => array(
- 'all' => __('All', 'acf'),
- 'uploadedTo' => __('Uploaded to post', 'acf')
- )
- ));
-
-
- // min
- 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(
- 'label' => '',
- 'type' => 'text',
- 'name' => 'min_height',
- 'prepend' => __('Height', 'acf'),
- 'append' => 'px',
- '_append' => 'min_width'
- ));
-
- acf_render_field_setting( $field, array(
- 'label' => '',
- 'type' => 'text',
- 'name' => 'min_size',
- 'prepend' => __('File size', 'acf'),
- 'append' => 'MB',
- '_append' => 'min_width'
- ));
-
-
- // max
- 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(
- 'label' => '',
- 'type' => 'text',
- 'name' => 'max_height',
- 'prepend' => __('Height', 'acf'),
- 'append' => 'px',
- '_append' => 'max_width'
- ));
-
- acf_render_field_setting( $field, array(
- 'label' => '',
- 'type' => 'text',
- 'name' => 'max_size',
- 'prepend' => __('File size', 'acf'),
- 'append' => 'MB',
- '_append' => 'max_width'
- ));
-
-
- // allowed type
- 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',
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) return false;
-
-
- // bail early if not numeric (error message)
- if( !is_numeric($value) ) return false;
-
-
- // convert to int
- $value = intval($value);
-
-
- // format
- if( $field['return_format'] == 'url' ) {
-
- return wp_get_attachment_url( $value );
-
- } elseif( $field['return_format'] == 'array' ) {
-
- return acf_get_attachment( $value );
-
- }
-
-
- // return
- return $value;
-
- }
-
-
- /*
- * get_media_item_args
- *
- * description
- *
- * @type function
- * @date 27/01/13
- * @since 3.6.0
- *
- * @param $vars (array)
- * @return $vars
- */
-
- function get_media_item_args( $vars ) {
-
- $vars['send'] = true;
- return($vars);
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $post_id - the $post_id of which the value will be saved
- * @param $field - the field array holding all the field options
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- return acf_get_field_type('file')->update_value( $value, $post_id, $field );
-
- }
-
-
- /*
- * validate_value
- *
- * This function will validate a basic file input
- *
- * @type function
- * @date 11/02/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function validate_value( $valid, $value, $field, $input ){
-
- return acf_get_field_type('file')->validate_value( $valid, $value, $field, $input );
-
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field_image' );
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return false;
+ }
+
+ // bail early if not numeric (error message)
+ if ( ! is_numeric( $value ) ) {
+ return false;
+ }
+
+ // convert to int
+ $value = intval( $value );
+
+ // format
+ if ( $field['return_format'] == 'url' ) {
+
+ return wp_get_attachment_url( $value );
+
+ } elseif ( $field['return_format'] == 'array' ) {
+
+ return acf_get_attachment( $value );
+
+ }
+
+ // return
+ return $value;
+
+ }
+
+
+ /*
+ * get_media_item_args
+ *
+ * description
+ *
+ * @type function
+ * @date 27/01/13
+ * @since 3.6.0
+ *
+ * @param $vars (array)
+ * @return $vars
+ */
+
+ function get_media_item_args( $vars ) {
+
+ $vars['send'] = true;
+ return( $vars );
+
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ return acf_get_field_type( 'file' )->update_value( $value, $post_id, $field );
+
+ }
+
+
+ /*
+ * validate_value
+ *
+ * This function will validate a basic file input
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ return acf_get_field_type( 'file' )->validate_value( $valid, $value, $field, $input );
+
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_image' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-link.php b/includes/fields/class-acf-field-link.php
index d5bfb55..4c78de5 100644
--- a/includes/fields/class-acf-field-link.php
+++ b/includes/fields/class-acf-field-link.php
@@ -1,287 +1,291 @@
name = 'link';
- $this->label = __("Link",'acf');
- $this->category = 'relational';
- $this->defaults = array(
- 'return_format' => 'array',
- );
-
- }
-
-
- /*
- * get_link
- *
- * description
- *
- * @type function
- * @date 16/5/17
- * @since 5.5.13
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function get_link( $value = '' ) {
-
- // vars
- $link = array(
- 'title' => '',
- 'url' => '',
- 'target' => ''
- );
-
-
- // array (ACF 5.6.0)
- if( is_array($value) ) {
-
- $link = array_merge($link, $value);
-
- // post id (ACF < 5.6.0)
- } elseif( is_numeric($value) ) {
-
- $link['title'] = get_the_title( $value );
- $link['url'] = get_permalink( $value );
-
- // string (ACF < 5.6.0)
- } elseif( is_string($value) ) {
-
- $link['url'] = $value;
-
- }
-
-
- // return
- return $link;
-
- }
-
+ class acf_field_link extends acf_field {
+
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'link';
+ $this->label = __( 'Link', 'acf' );
+ $this->category = 'relational';
+ $this->defaults = array(
+ 'return_format' => 'array',
+ );
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ){
-
- // vars
- $div = array(
- 'id' => $field['id'],
- 'class' => $field['class'] . ' acf-link',
- );
-
-
- // render scripts/styles
- acf_enqueue_uploader();
-
-
- // get link
- $link = $this->get_link( $field['value'] );
-
-
- // classes
- if( $link['url'] ) {
- $div['class'] .= ' -value';
}
-
- if( $link['target'] === '_blank' ) {
- $div['class'] .= ' -external';
+
+
+ /*
+ * get_link
+ *
+ * description
+ *
+ * @type function
+ * @date 16/5/17
+ * @since 5.5.13
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function get_link( $value = '' ) {
+
+ // vars
+ $link = array(
+ 'title' => '',
+ 'url' => '',
+ 'target' => '',
+ );
+
+ // array (ACF 5.6.0)
+ if ( is_array( $value ) ) {
+
+ $link = array_merge( $link, $value );
+
+ // post id (ACF < 5.6.0)
+ } elseif ( is_numeric( $value ) ) {
+
+ $link['title'] = get_the_title( $value );
+ $link['url'] = get_permalink( $value );
+
+ // string (ACF < 5.6.0)
+ } elseif ( is_string( $value ) ) {
+
+ $link['url'] = $value;
+
+ }
+
+ // return
+ return $link;
+
}
-
- /**/
-?>
->
+ ?>*/
+ ?>
+
>
- __('Return Value','acf'),
- 'instructions' => __('Specify the returned value on front end','acf'),
- 'type' => 'radio',
- 'name' => 'return_format',
- 'layout' => 'horizontal',
- 'choices' => array(
- 'array' => __("Link Array",'acf'),
- 'url' => __("Link URL",'acf'),
- )
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) return $value;
-
-
- // get link
- $link = $this->get_link( $value );
-
-
- // format value
- if( $field['return_format'] == 'url' ) {
-
- return $link['url'];
-
+ __( 'Return Value', 'acf' ),
+ 'instructions' => __( 'Specify the returned value on front end', 'acf' ),
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'layout' => 'horizontal',
+ 'choices' => array(
+ 'array' => __( 'Link Array', 'acf' ),
+ 'url' => __( 'Link URL', 'acf' ),
+ ),
+ )
+ );
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // get link
+ $link = $this->get_link( $value );
+
+ // format value
+ if ( $field['return_format'] == 'url' ) {
+
+ return $link['url'];
+
+ }
+
+ // return link
+ return $link;
+
+ }
+
+
+ /*
+ * validate_value
+ *
+ * description
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ // bail early if not required
+ if ( ! $field['required'] ) {
+ return $valid;
+ }
+
+ // URL is required
+ if ( empty( $value ) || empty( $value['url'] ) ) {
+
+ return false;
+
+ }
+
+ // return
+ return $valid;
+
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // Check if value is an empty array and convert to empty string.
+ if ( empty( $value ) || empty( $value['url'] ) ) {
+ $value = '';
+ }
+
+ // return
+ return $value;
+ }
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_link' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-message.php b/includes/fields/class-acf-field-message.php
index 3fd2118..f47d308 100644
--- a/includes/fields/class-acf-field-message.php
+++ b/includes/fields/class-acf-field-message.php
@@ -1,198 +1,200 @@
name = 'message';
+ $this->label = __( 'Message', 'acf' );
+ $this->category = 'layout';
+ $this->defaults = array(
+ 'message' => '',
+ 'esc_html' => 0,
+ 'new_lines' => 'wpautop',
+ );
-class acf_field_message extends acf_field {
-
-
- /*
- * __construct
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'message';
- $this->label = __("Message",'acf');
- $this->category = 'layout';
- $this->defaults = array(
- 'message' => '',
- 'esc_html' => 0,
- 'new_lines' => 'wpautop',
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // vars
- $m = $field['message'];
-
-
- // wptexturize (improves "quotes")
- $m = wptexturize( $m );
-
-
- // esc_html
- if( $field['esc_html'] ) {
-
- $m = esc_html( $m );
-
}
-
-
- // new lines
- if( $field['new_lines'] == 'wpautop' ) {
-
- $m = wpautop($m);
-
- } elseif( $field['new_lines'] == 'br' ) {
-
- $m = nl2br($m);
-
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $m = $field['message'];
+
+ // wptexturize (improves "quotes")
+ $m = wptexturize( $m );
+
+ // esc_html
+ if ( $field['esc_html'] ) {
+
+ $m = esc_html( $m );
+
+ }
+
+ // new lines
+ if ( $field['new_lines'] == 'wpautop' ) {
+
+ $m = wpautop( $m );
+
+ } elseif ( $field['new_lines'] == 'br' ) {
+
+ $m = nl2br( $m );
+
+ }
+
+ // return
+ echo acf_esc_html( $m );
+
}
-
-
- // return
- echo acf_esc_html( $m );
-
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field_settings( $field ) {
-
- // default_value
- acf_render_field_setting( $field, array(
- 'label' => __('Message','acf'),
- 'instructions' => '',
- 'type' => 'textarea',
- 'name' => 'message',
- ));
-
-
- // formatting
- acf_render_field_setting( $field, array(
- 'label' => __('New Lines','acf'),
- 'instructions' => __('Controls how new lines are rendered','acf'),
- 'type' => 'select',
- 'name' => 'new_lines',
- 'choices' => array(
- 'wpautop' => __("Automatically add paragraphs",'acf'),
- 'br' => __("Automatically add <br>",'acf'),
- '' => __("No Formatting",'acf')
- )
- ));
-
-
- // HTML
- acf_render_field_setting( $field, array(
- 'label' => __('Escape HTML','acf'),
- 'instructions' => __('Allow HTML markup to display as visible text instead of rendering','acf'),
- 'name' => 'esc_html',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
- }
-
-
- /*
- * translate_field
- *
- * This function will translate field settings
- *
- * @type function
- * @date 8/03/2016
- * @since 5.3.2
- *
- * @param $field (array)
- * @return $field
- */
-
- function translate_field( $field ) {
-
- // translate
- $field['message'] = acf_translate( $field['message'] );
-
-
- // return
- return $field;
-
- }
-
-
- /*
- * load_field()
- *
- * This filter is appied to the $field after it is loaded from the database
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - the field array holding all the field options
- *
- * @return $field - the field array holding all the field options
- */
- function load_field( $field ) {
-
- // remove name to avoid caching issue
- $field['name'] = '';
-
- // remove instructions
- $field['instructions'] = '';
-
- // remove required to avoid JS issues
- $field['required'] = 0;
-
- // set value other than 'null' to avoid ACF loading / caching issue
- $field['value'] = false;
-
- // return
- return $field;
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field_message' );
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field_settings( $field ) {
+
+ // default_value
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Message', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'textarea',
+ 'name' => 'message',
+ )
+ );
+
+ // formatting
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'New Lines', 'acf' ),
+ 'instructions' => __( 'Controls how new lines are rendered', 'acf' ),
+ 'type' => 'select',
+ 'name' => 'new_lines',
+ 'choices' => array(
+ 'wpautop' => __( 'Automatically add paragraphs', 'acf' ),
+ 'br' => __( 'Automatically add <br>', 'acf' ),
+ '' => __( 'No Formatting', 'acf' ),
+ ),
+ )
+ );
+
+ // HTML
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Escape HTML', 'acf' ),
+ 'instructions' => __( 'Allow HTML markup to display as visible text instead of rendering', 'acf' ),
+ 'name' => 'esc_html',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ }
+
+
+ /*
+ * translate_field
+ *
+ * This function will translate field settings
+ *
+ * @type function
+ * @date 8/03/2016
+ * @since 5.3.2
+ *
+ * @param $field (array)
+ * @return $field
+ */
+
+ function translate_field( $field ) {
+
+ // translate
+ $field['message'] = acf_translate( $field['message'] );
+
+ // return
+ return $field;
+
+ }
+
+
+ /*
+ * load_field()
+ *
+ * This filter is appied to the $field after it is loaded from the database
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - the field array holding all the field options
+ *
+ * @return $field - the field array holding all the field options
+ */
+ function load_field( $field ) {
+
+ // remove name to avoid caching issue
+ $field['name'] = '';
+
+ // remove instructions
+ $field['instructions'] = '';
+
+ // remove required to avoid JS issues
+ $field['required'] = 0;
+
+ // set value other than 'null' to avoid ACF loading / caching issue
+ $field['value'] = false;
+
+ // return
+ return $field;
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_message' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-number.php b/includes/fields/class-acf-field-number.php
index 0395471..c24d547 100644
--- a/includes/fields/class-acf-field-number.php
+++ b/includes/fields/class-acf-field-number.php
@@ -1,304 +1,307 @@
name = 'number';
+ $this->label = __( 'Number', 'acf' );
+ $this->defaults = array(
+ 'default_value' => '',
+ 'min' => '',
+ 'max' => '',
+ 'step' => '',
+ 'placeholder' => '',
+ 'prepend' => '',
+ 'append' => '',
+ );
-class acf_field_number extends acf_field {
-
-
- /*
- * initialize
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'number';
- $this->label = __("Number",'acf');
- $this->defaults = array(
- 'default_value' => '',
- 'min' => '',
- 'max' => '',
- 'step' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => ''
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // vars
- $atts = array();
- $keys = array( 'type', 'id', 'class', 'name', 'value', 'min', 'max', 'step', 'placeholder', 'pattern' );
- $keys2 = array( 'readonly', 'disabled', 'required' );
- $html = '';
-
-
- // step
- if( !$field['step'] ) {
- $field['step'] = 'any';
}
-
-
- // prepend
- if( $field['prepend'] !== '' ) {
-
- $field['class'] .= ' acf-is-prepended';
- $html .= '
-
- $v ): ?>
- "input-$k", 'name' => $field['name'] . "[$k]", 'value' => $v )); ?>
+
+ $v ) : ?>
+ "input-$k",
+ 'name' => $field['name'] . "[$k]",
+ 'value' => $v,
+ )
+ );
+ ?>
-
+
' . acf_esc_html($field['prepend']) . '
';
-
- }
-
-
- // append
- if( $field['append'] !== '' ) {
-
- $field['class'] .= ' acf-is-appended';
- $html .= '' . acf_esc_html($field['append']) . '
';
-
- }
-
-
- // atts (value="123")
- foreach( $keys as $k ) {
- if( isset($field[ $k ]) ) $atts[ $k ] = $field[ $k ];
- }
-
-
- // atts2 (disabled="disabled")
- foreach( $keys2 as $k ) {
- if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
- }
-
-
- // remove empty atts
- $atts = acf_clean_atts( $atts );
-
-
- // render
- $html .= '' . acf_get_text_input( $atts ) . '
';
-
-
- // return
- echo $html;
-
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- 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'),
- 'type' => 'text',
- 'name' => 'default_value',
- ));
-
-
- // placeholder
- 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'),
- 'type' => 'text',
- 'name' => 'prepend',
- ));
-
-
- // append
- acf_render_field_setting( $field, array(
- 'label' => __('Append','acf'),
- 'instructions' => __('Appears after the input','acf'),
- 'type' => 'text',
- 'name' => 'append',
- ));
-
-
- // min
- acf_render_field_setting( $field, array(
- 'label' => __('Minimum Value','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'min',
- ));
-
-
- // max
- acf_render_field_setting( $field, array(
- 'label' => __('Maximum Value','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'max',
- ));
-
-
- // max
- acf_render_field_setting( $field, array(
- 'label' => __('Step Size','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'step',
- ));
-
- }
-
-
- /*
- * validate_value
- *
- * description
- *
- * @type function
- * @date 11/02/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function validate_value( $valid, $value, $field, $input ){
-
- // remove ','
- if( acf_str_exists(',', $value) ) {
-
- $value = str_replace(',', '', $value);
-
- }
-
-
- // if value is not numeric...
- if( !is_numeric($value) ) {
-
- // allow blank to be saved
- if( !empty($value) ) {
-
- $valid = __('Value must be a number', 'acf');
-
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $atts = array();
+ $keys = array( 'type', 'id', 'class', 'name', 'value', 'min', 'max', 'step', 'placeholder', 'pattern' );
+ $keys2 = array( 'readonly', 'disabled', 'required' );
+ $html = '';
+
+ // step
+ if ( ! $field['step'] ) {
+ $field['step'] = 'any';
}
-
-
- // return early
+
+ // prepend
+ if ( $field['prepend'] !== '' ) {
+
+ $field['class'] .= ' acf-is-prepended';
+ $html .= '' . acf_esc_html( $field['prepend'] ) . '
';
+
+ }
+
+ // append
+ if ( $field['append'] !== '' ) {
+
+ $field['class'] .= ' acf-is-appended';
+ $html .= '' . acf_esc_html( $field['append'] ) . '
';
+
+ }
+
+ // atts (value="123")
+ foreach ( $keys as $k ) {
+ if ( isset( $field[ $k ] ) ) {
+ $atts[ $k ] = $field[ $k ];
+ }
+ }
+
+ // atts2 (disabled="disabled")
+ foreach ( $keys2 as $k ) {
+ if ( ! empty( $field[ $k ] ) ) {
+ $atts[ $k ] = $k;
+ }
+ }
+
+ // remove empty atts
+ $atts = acf_clean_atts( $atts );
+
+ // render
+ $html .= '' . acf_get_text_input( $atts ) . '
';
+
+ // return
+ echo $html;
+
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ 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' ),
+ 'type' => 'text',
+ 'name' => 'default_value',
+ )
+ );
+
+ // placeholder
+ 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' ),
+ 'type' => 'text',
+ 'name' => 'prepend',
+ )
+ );
+
+ // append
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Append', 'acf' ),
+ 'instructions' => __( 'Appears after the input', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'append',
+ )
+ );
+
+ // min
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Minimum Value', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'min',
+ )
+ );
+
+ // max
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Maximum Value', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'max',
+ )
+ );
+
+ // max
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Step Size', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'step',
+ )
+ );
+
+ }
+
+
+ /*
+ * validate_value
+ *
+ * description
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ // remove ','
+ if ( acf_str_exists( ',', $value ) ) {
+
+ $value = str_replace( ',', '', $value );
+
+ }
+
+ // if value is not numeric...
+ if ( ! is_numeric( $value ) ) {
+
+ // allow blank to be saved
+ if ( ! empty( $value ) ) {
+
+ $valid = __( 'Value must be a number', 'acf' );
+
+ }
+
+ // return early
+ return $valid;
+
+ }
+
+ // convert
+ $value = floatval( $value );
+
+ // min
+ if ( is_numeric( $field['min'] ) && $value < floatval( $field['min'] ) ) {
+
+ $valid = sprintf( __( 'Value must be equal to or higher than %d', 'acf' ), $field['min'] );
+
+ }
+
+ // max
+ if ( is_numeric( $field['max'] ) && $value > floatval( $field['max'] ) ) {
+
+ $valid = sprintf( __( 'Value must be equal to or lower than %d', 'acf' ), $field['max'] );
+
+ }
+
+ // return
return $valid;
-
+
}
-
-
- // convert
- $value = floatval($value);
-
-
- // min
- if( is_numeric($field['min']) && $value < floatval($field['min'])) {
-
- $valid = sprintf(__('Value must be equal to or higher than %d', 'acf'), $field['min'] );
-
- }
-
-
- // max
- if( is_numeric($field['max']) && $value > floatval($field['max']) ) {
-
- $valid = sprintf(__('Value must be equal to or lower than %d', 'acf'), $field['max'] );
-
- }
-
-
- // return
- return $valid;
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $field - the field array holding all the field options
- * @param $post_id - the $post_id of which the value will be saved
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // no formatting needed for empty value
- if( empty($value) ) {
-
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $field - the field array holding all the field options
+ * @param $post_id - the $post_id of which the value will be saved
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // no formatting needed for empty value
+ if ( empty( $value ) ) {
+
+ return $value;
+
+ }
+
+ // remove ','
+ if ( acf_str_exists( ',', $value ) ) {
+
+ $value = str_replace( ',', '', $value );
+
+ }
+
+ // return
return $value;
-
+
}
-
-
- // remove ','
- if( acf_str_exists(',', $value) ) {
-
- $value = str_replace(',', '', $value);
-
- }
-
-
- // return
- return $value;
-
+
+
}
-
-
-}
-// initialize
-acf_register_field_type( 'acf_field_number' );
+ // initialize
+ acf_register_field_type( 'acf_field_number' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-oembed.php b/includes/fields/class-acf-field-oembed.php
index 6e59465..70fd083 100644
--- a/includes/fields/class-acf-field-oembed.php
+++ b/includes/fields/class-acf-field-oembed.php
@@ -1,219 +1,237 @@
name = 'oembed';
+ $this->label = __( 'oEmbed', 'acf' );
+ $this->category = 'content';
+ $this->defaults = array(
+ 'width' => '',
+ 'height' => '',
+ );
+ $this->width = 640;
+ $this->height = 390;
+
+ // extra
+ add_action( 'wp_ajax_acf/fields/oembed/search', array( $this, 'ajax_query' ) );
+ add_action( 'wp_ajax_nopriv_acf/fields/oembed/search', array( $this, 'ajax_query' ) );
-class acf_field_oembed extends acf_field {
-
-
- /*
- * __construct
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'oembed';
- $this->label = __("oEmbed",'acf');
- $this->category = 'content';
- $this->defaults = array(
- 'width' => '',
- 'height' => '',
- );
- $this->width = 640;
- $this->height = 390;
-
-
- // extra
- add_action('wp_ajax_acf/fields/oembed/search', array($this, 'ajax_query'));
- add_action('wp_ajax_nopriv_acf/fields/oembed/search', array($this, 'ajax_query'));
-
- }
-
-
- /*
- * prepare_field
- *
- * This function will prepare the field for input
- *
- * @type function
- * @date 14/2/17
- * @since 5.5.8
- *
- * @param $field (array)
- * @return (int)
- */
-
- function prepare_field( $field ) {
-
- // defaults
- if( !$field['width'] ) $field['width'] = $this->width;
- if( !$field['height'] ) $field['height'] = $this->height;
-
-
- // return
- return $field;
-
- }
-
-
- /*
- * wp_oembed_get
- *
- * description
- *
- * @type function
- * @date 24/01/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function wp_oembed_get( $url = '', $width = 0, $height = 0 ) {
-
- // vars
- $embed = '';
- $res = array(
- 'width' => $width,
- 'height' => $height
- );
-
-
- // get emebed
- $embed = @wp_oembed_get( $url, $res );
-
-
- // try shortcode
- if( !$embed ) {
-
- // global
- global $wp_embed;
-
-
- // get emebed
- $embed = $wp_embed->shortcode($res, $url);
-
}
-
-
- // return
- return $embed;
- }
+
+
+ /*
+ * prepare_field
+ *
+ * This function will prepare the field for input
+ *
+ * @type function
+ * @date 14/2/17
+ * @since 5.5.8
+ *
+ * @param $field (array)
+ * @return (int)
+ */
+
+ function prepare_field( $field ) {
+
+ // defaults
+ if ( ! $field['width'] ) {
+ $field['width'] = $this->width;
+ }
+ if ( ! $field['height'] ) {
+ $field['height'] = $this->height;
+ }
+
+ // return
+ return $field;
+
+ }
+
+
+ /*
+ * wp_oembed_get
+ *
+ * description
+ *
+ * @type function
+ * @date 24/01/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function wp_oembed_get( $url = '', $width = 0, $height = 0 ) {
+
+ // vars
+ $embed = '';
+ $res = array(
+ 'width' => $width,
+ 'height' => $height,
+ );
+
+ // get emebed
+ $embed = @wp_oembed_get( $url, $res );
+
+ // try shortcode
+ if ( ! $embed ) {
+
+ // global
+ global $wp_embed;
+
+ // get emebed
+ $embed = $wp_embed->shortcode( $res, $url );
+
+ }
+
+ // return
+ return $embed;
+ }
+
+
+ /*
+ * ajax_query
+ *
+ * description
+ *
+ * @type function
+ * @date 24/10/13
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function ajax_query() {
+
+ // validate
+ if ( ! acf_verify_ajax() ) {
+ die();
+ }
+
+ // get choices
+ $response = $this->get_ajax_query( $_POST );
+
+ // return
+ wp_send_json( $response );
+
+ }
+
+
+ /*
+ * get_ajax_query
+ *
+ * This function will return an array of data formatted for use in a select2 AJAX response
+ *
+ * @type function
+ * @date 15/10/2014
+ * @since 5.0.9
+ *
+ * @param $options (array)
+ * @return (array)
+ */
+
+ function get_ajax_query( $args = array() ) {
+
+ // defaults
+ $args = acf_parse_args(
+ $args,
+ array(
+ 's' => '',
+ 'field_key' => '',
+ )
+ );
+
+ // load field
+ $field = acf_get_field( $args['field_key'] );
+ if ( ! $field ) {
+ return false;
+ }
+
+ // prepare field to correct width and height
+ $field = $this->prepare_field( $field );
+
+ // vars
+ $response = array(
+ 'url' => $args['s'],
+ 'html' => $this->wp_oembed_get( $args['s'], $field['width'], $field['height'] ),
+ );
+
+ // return
+ return $response;
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // atts
+ $atts = array(
+ 'class' => 'acf-oembed',
+ );
+
+ // _e("No embed found for the given URL.", 'acf');
+
+ // value
+ if ( $field['value'] ) {
+ $atts['class'] .= ' has-value';
+ }
+
+ ?>
+>
-
- /*
- * ajax_query
- *
- * description
- *
- * @type function
- * @date 24/10/13
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function ajax_query() {
-
- // validate
- if( !acf_verify_ajax() ) die();
-
-
- // get choices
- $response = $this->get_ajax_query( $_POST );
-
-
- // return
- wp_send_json($response);
-
- }
-
-
- /*
- * get_ajax_query
- *
- * This function will return an array of data formatted for use in a select2 AJAX response
- *
- * @type function
- * @date 15/10/2014
- * @since 5.0.9
- *
- * @param $options (array)
- * @return (array)
- */
-
- function get_ajax_query( $args = array() ) {
-
- // defaults
- $args = acf_parse_args($args, array(
- 's' => '',
- 'field_key' => '',
- ));
-
-
- // load field
- $field = acf_get_field( $args['field_key'] );
- if( !$field ) return false;
-
-
- // prepare field to correct width and height
- $field = $this->prepare_field($field);
-
-
- // vars
- $response = array(
- 'url' => $args['s'],
- 'html' => $this->wp_oembed_get($args['s'], $field['width'], $field['height'])
- );
-
-
- // return
- return $response;
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // atts
- $atts = array(
- 'class' => 'acf-oembed',
- );
-
- // _e("No embed found for the given URL.", 'acf');
-
- // value
- if( $field['value'] ) $atts['class'] .= ' has-value';
-
-?>
-
>
-
- 'input-value', 'name' => $field['name'], 'value' => $field['value'] )); ?>
+ 'input-value',
+ 'name' => $field['name'],
+ 'value' => $field['value'],
+ )
+ );
+ ?>
- 'input-search', 'value' => $field['value'], 'placeholder' => __("Enter URL", 'acf'), 'autocomplete' => 'off' )); ?>
+ 'input-search',
+ 'value' => $field['value'],
+ 'placeholder' => __( 'Enter URL', 'acf' ),
+ 'autocomplete' => 'off',
+ )
+ );
+ ?>
@@ -221,100 +239,106 @@ class acf_field_oembed extends acf_field {
- __('Embed Size','acf'),
- 'type' => 'text',
- 'name' => 'width',
- 'prepend' => __('Width', 'acf'),
- 'append' => 'px',
- 'placeholder' => $this->width
- ));
-
-
- // height
- acf_render_field_setting( $field, array(
- 'label' => __('Embed Size','acf'),
- 'type' => 'text',
- 'name' => 'height',
- 'prepend' => __('Height', 'acf'),
- 'append' => 'px',
- 'placeholder' => $this->height,
- '_append' => 'width'
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) return $value;
-
-
- // prepare field to correct width and height
- $field = $this->prepare_field($field);
-
-
- // get oembed
- $value = $this->wp_oembed_get($value, $field['width'], $field['height']);
-
-
- // return
- return $value;
-
- }
-
-}
+ __( 'Embed Size', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'width',
+ 'prepend' => __( 'Width', 'acf' ),
+ 'append' => 'px',
+ 'placeholder' => $this->width,
+ )
+ );
+
+ // height
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Embed Size', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'height',
+ 'prepend' => __( 'Height', 'acf' ),
+ 'append' => 'px',
+ 'placeholder' => $this->height,
+ '_append' => 'width',
+ )
+ );
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // prepare field to correct width and height
+ $field = $this->prepare_field( $field );
+
+ // get oembed
+ $value = $this->wp_oembed_get( $value, $field['width'], $field['height'] );
+
+ // return
+ return $value;
+
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_oembed' );
endif; // class_exists check
-?>
\ No newline at end of file
+?>
diff --git a/includes/fields/class-acf-field-output.php b/includes/fields/class-acf-field-output.php
index 25ff37c..43b6c4c 100644
--- a/includes/fields/class-acf-field-output.php
+++ b/includes/fields/class-acf-field-output.php
@@ -1,77 +1,78 @@
name = 'output';
+ $this->label = 'output';
+ $this->public = false;
+ $this->defaults = array(
+ 'html' => false,
+ );
-class acf_field_output extends acf_field {
-
-
- /*
- * __construct
- *
- * This function will setup the field type data
- *
- * @type function
- * @date 5/03/2014
- * @since 5.0.0
- *
- * @param n/a
- * @return n/a
- */
-
- function initialize() {
-
- // vars
- $this->name = 'output';
- $this->label = 'output';
- $this->public = false;
- $this->defaults = array(
- 'html' => false
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field (array) the $field being rendered
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field (array) the $field being edited
- * @return n/a
- */
-
- function render_field( $field ) {
-
- // bail early if no html
- if( !$field['html'] ) return;
-
-
- // html
- if( is_string($field['html']) && !function_exists($field['html']) ) {
-
- echo $field['html'];
-
- // function
- } else {
-
- call_user_func_array($field['html'], array($field));
-
}
-
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field (array) the $field being rendered
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field (array) the $field being edited
+ * @return n/a
+ */
+
+ function render_field( $field ) {
+
+ // bail early if no html
+ if ( ! $field['html'] ) {
+ return;
+ }
+
+ // html
+ if ( is_string( $field['html'] ) && ! function_exists( $field['html'] ) ) {
+
+ echo $field['html'];
+
+ // function
+ } else {
+
+ call_user_func_array( $field['html'], array( $field ) );
+
+ }
+
+ }
+
}
-
-}
-// initialize
-acf_register_field_type( 'acf_field_output' );
+ // initialize
+ acf_register_field_type( 'acf_field_output' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-page_link.php b/includes/fields/class-acf-field-page_link.php
index 1df89d4..eae797b 100644
--- a/includes/fields/class-acf-field-page_link.php
+++ b/includes/fields/class-acf-field-page_link.php
@@ -1,656 +1,630 @@
name = 'page_link';
- $this->label = __("Page Link",'acf');
- $this->category = 'relational';
- $this->defaults = array(
- 'post_type' => array(),
- 'taxonomy' => array(),
- 'allow_null' => 0,
- 'multiple' => 0,
- 'allow_archives' => 1
- );
-
-
- // extra
- add_action('wp_ajax_acf/fields/page_link/query', array($this, 'ajax_query'));
- add_action('wp_ajax_nopriv_acf/fields/page_link/query', array($this, 'ajax_query'));
-
- }
-
-
- /*
- * ajax_query
- *
- * description
- *
- * @type function
- * @date 24/10/13
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function ajax_query() {
-
- // validate
- if( !acf_verify_ajax() ) die();
-
-
- // defaults
- $options = acf_parse_args($_POST, array(
- 'post_id' => 0,
- 's' => '',
- 'field_key' => '',
- 'paged' => 1
- ));
-
-
- // vars
- $results = array();
- $args = array();
- $s = false;
- $is_search = false;
-
-
- // paged
- $args['posts_per_page'] = 20;
- $args['paged'] = $options['paged'];
-
-
- // search
- if( $options['s'] !== '' ) {
-
- // strip slashes (search may be integer)
- $s = wp_unslash( strval($options['s']) );
-
-
- // update vars
- $args['s'] = $s;
- $is_search = true;
-
- }
-
-
- // load field
- $field = acf_get_field( $options['field_key'] );
- if( !$field ) die();
-
-
- // update $args
- if( !empty($field['post_type']) ) {
-
- $args['post_type'] = acf_get_array( $field['post_type'] );
-
- } else {
-
- $args['post_type'] = acf_get_post_types();
-
- }
-
- // create tax queries
- if( !empty($field['taxonomy']) ) {
-
- // append to $args
- $args['tax_query'] = array();
-
-
- // decode terms
- $taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
-
-
- // now create the tax queries
- foreach( $taxonomies as $taxonomy => $terms ) {
-
- $args['tax_query'][] = array(
- 'taxonomy' => $taxonomy,
- 'field' => 'slug',
- 'terms' => $terms,
- );
-
- }
- }
-
-
- // filters
- $args = apply_filters('acf/fields/page_link/query', $args, $field, $options['post_id']);
- $args = apply_filters('acf/fields/page_link/query/name=' . $field['name'], $args, $field, $options['post_id'] );
- $args = apply_filters('acf/fields/page_link/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-
-
- // add archives to $results
- if( $field['allow_archives'] && $args['paged'] == 1 ) {
-
- // Generate unique list of URLs.
- $links = array();
- $links[] = home_url();
- foreach( $args['post_type'] as $post_type ) {
- $links[] = get_post_type_archive_link( $post_type );
- }
- $links = array_filter( $links );
- $links = array_unique( $links );
+ class acf_field_page_link extends acf_field {
- // Convert list into choices.
- $children = array();
- foreach( $links as $link ) {
- // Ignore if search does not match.
- if( $is_search && stripos($link, $s) === false ) {
- continue;
- }
- $children[] = array(
- 'id' => $link,
- 'text' => $link
- );
- }
- if( $children ) {
- $results[] = array(
- 'text' => __('Archives', 'acf'),
- 'children' => $children
- );
- }
- }
-
-
- // get posts grouped by post type
- $groups = acf_get_grouped_posts( $args );
-
-
- // loop
- if( !empty($groups) ) {
-
- foreach( array_keys($groups) as $group_title ) {
-
- // vars
- $posts = acf_extract_var( $groups, $group_title );
-
-
- // data
- $data = array(
- 'text' => $group_title,
- 'children' => array()
- );
-
-
- // convert post objects to post titles
- foreach( array_keys($posts) as $post_id ) {
-
- $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
-
- }
-
-
- // order posts by search
- if( $is_search && empty($args['orderby']) && isset($args['s']) ) {
-
- $posts = acf_order_by_search( $posts, $args['s'] );
-
- }
-
-
- // append to $data
- foreach( array_keys($posts) as $post_id ) {
-
- $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
-
- }
-
-
- // append to $results
- $results[] = $data;
-
- }
-
- }
-
-
- // return
- acf_send_ajax_results(array(
- 'results' => $results,
- 'limit' => $args['posts_per_page']
- ));
-
- }
-
-
- /*
- * get_post_result
- *
- * This function will return an array containing id, text and maybe description data
- *
- * @type function
- * @date 7/07/2016
- * @since 5.4.0
- *
- * @param $id (mixed)
- * @param $text (string)
- * @return (array)
- */
-
- function get_post_result( $id, $text ) {
-
- // vars
- $result = array(
- 'id' => $id,
- 'text' => $text
- );
-
-
- // look for parent
- $search = '| ' . __('Parent', 'acf') . ':';
- $pos = strpos($text, $search);
-
- if( $pos !== false ) {
-
- $result['description'] = substr($text, $pos+2);
- $result['text'] = substr($text, 0, $pos);
-
- }
-
-
- // return
- return $result;
-
- }
-
-
- /*
- * get_post_title
- *
- * This function returns the HTML for a result
- *
- * @type function
- * @date 1/11/2013
- * @since 5.0.0
- *
- * @param $post (object)
- * @param $field (array)
- * @param $post_id (int) the post_id to which this value is saved to
- * @return (string)
- */
-
- function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
-
- // get post_id
- if( !$post_id ) $post_id = acf_get_form_data('post_id');
-
-
- // vars
- $title = acf_get_post_title( $post, $is_search );
-
-
- // filters
- $title = apply_filters('acf/fields/page_link/result', $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/page_link/result/name=' . $field['_name'], $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/page_link/result/key=' . $field['key'], $title, $post, $field, $post_id);
-
-
- // return
- return $title;
-
- }
-
-
- /*
- * get_posts
- *
- * This function will return an array of posts for a given field value
- *
- * @type function
- * @date 13/06/2014
- * @since 5.0.0
- *
- * @param $value (array)
- * @return $value
- */
-
- function get_posts( $value, $field ) {
-
- // force value to array
- $value = acf_get_array( $value );
-
-
- // get selected post ID's
- $post__in = array();
-
- foreach( $value as $k => $v ) {
-
- if( is_numeric($v) ) {
-
- // append to $post__in
- $post__in[] = (int) $v;
-
- }
-
- }
-
-
- // bail early if no posts
- if( empty($post__in) ) {
-
- return $value;
-
- }
-
-
- // get posts
- $posts = acf_get_posts(array(
- 'post__in' => $post__in,
- 'post_type' => $field['post_type']
- ));
-
-
- // override value with post
- $return = array();
-
-
- // append to $return
- foreach( $value as $k => $v ) {
-
- if( is_numeric($v) ) {
-
- // extract first post
- $post = array_shift( $posts );
-
-
- // append
- if( $post ) {
-
- $return[] = $post;
-
- }
-
- } else {
-
- $return[] = $v;
-
- }
-
- }
-
-
- // return
- return $return;
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ){
-
- // Change Field into a select
- $field['type'] = 'select';
- $field['ui'] = 1;
- $field['ajax'] = 1;
- $field['choices'] = array();
-
-
- // populate choices if value exists
- if( !empty($field['value']) ) {
-
- // get posts
- $posts = $this->get_posts( $field['value'], $field );
-
-
- // set choices
- if( !empty($posts) ) {
-
- foreach( array_keys($posts) as $i ) {
-
- // vars
- $post = acf_extract_var( $posts, $i );
-
-
- if( is_object($post) ) {
-
- // append to choices
- $field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
-
- } else {
-
- // append to choices
- $field['choices'][ $post ] = $post;
-
- }
-
- }
-
- }
-
- }
-
-
- // render
- acf_render_field( $field );
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- function render_field_settings( $field ) {
-
- // post_type
- acf_render_field_setting( $field, array(
- 'label' => __('Filter by Post Type','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'post_type',
- 'choices' => acf_get_pretty_post_types(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All post types",'acf'),
- ));
-
-
- // taxonomy
- acf_render_field_setting( $field, array(
- 'label' => __('Filter by Taxonomy','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'taxonomy',
- 'choices' => acf_get_taxonomy_terms(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All taxonomies",'acf'),
- ));
-
-
- // allow_null
- acf_render_field_setting( $field, array(
- 'label' => __('Allow Null?','acf'),
- 'instructions' => '',
- 'name' => 'allow_null',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
-
- // allow_archives
- acf_render_field_setting( $field, array(
- 'label' => __('Allow Archives URLs','acf'),
- 'instructions' => '',
- 'name' => 'allow_archives',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
-
- // multiple
- acf_render_field_setting( $field, array(
- 'label' => __('Select multiple values?','acf'),
- 'instructions' => '',
- 'name' => 'multiple',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // ACF4 null
- if( $value === 'null' ) {
-
- return false;
-
- }
-
-
- // bail early if no value
- if( empty($value) ) {
-
- return $value;
-
- }
-
-
- // get posts
- $value = $this->get_posts( $value, $field );
-
-
- // set choices
- foreach( array_keys($value) as $i ) {
-
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
// vars
- $post = acf_extract_var( $value, $i );
-
-
- // convert $post to permalink
- if( is_object($post) ) {
-
- $post = get_permalink( $post );
-
+ $this->name = 'page_link';
+ $this->label = __( 'Page Link', 'acf' );
+ $this->category = 'relational';
+ $this->defaults = array(
+ 'post_type' => array(),
+ 'taxonomy' => array(),
+ 'allow_null' => 0,
+ 'multiple' => 0,
+ 'allow_archives' => 1,
+ );
+
+ // extra
+ add_action( 'wp_ajax_acf/fields/page_link/query', array( $this, 'ajax_query' ) );
+ add_action( 'wp_ajax_nopriv_acf/fields/page_link/query', array( $this, 'ajax_query' ) );
+
+ }
+
+
+ /*
+ * ajax_query
+ *
+ * description
+ *
+ * @type function
+ * @date 24/10/13
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function ajax_query() {
+
+ // validate
+ if ( ! acf_verify_ajax() ) {
+ die();
}
-
-
- // append back to $value
- $value[ $i ] = $post;
-
+
+ // defaults
+ $options = acf_parse_args(
+ $_POST,
+ array(
+ 'post_id' => 0,
+ 's' => '',
+ 'field_key' => '',
+ 'paged' => 1,
+ )
+ );
+
+ // vars
+ $results = array();
+ $args = array();
+ $s = false;
+ $is_search = false;
+
+ // paged
+ $args['posts_per_page'] = 20;
+ $args['paged'] = $options['paged'];
+
+ // search
+ if ( $options['s'] !== '' ) {
+
+ // strip slashes (search may be integer)
+ $s = wp_unslash( strval( $options['s'] ) );
+
+ // update vars
+ $args['s'] = $s;
+ $is_search = true;
+
+ }
+
+ // load field
+ $field = acf_get_field( $options['field_key'] );
+ if ( ! $field ) {
+ die();
+ }
+
+ // update $args
+ if ( ! empty( $field['post_type'] ) ) {
+
+ $args['post_type'] = acf_get_array( $field['post_type'] );
+
+ } else {
+
+ $args['post_type'] = acf_get_post_types();
+
+ }
+
+ // create tax queries
+ if ( ! empty( $field['taxonomy'] ) ) {
+
+ // append to $args
+ $args['tax_query'] = array();
+
+ // decode terms
+ $taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
+
+ // now create the tax queries
+ foreach ( $taxonomies as $taxonomy => $terms ) {
+
+ $args['tax_query'][] = array(
+ 'taxonomy' => $taxonomy,
+ 'field' => 'slug',
+ 'terms' => $terms,
+ );
+
+ }
+ }
+
+ // filters
+ $args = apply_filters( 'acf/fields/page_link/query', $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/page_link/query/name=' . $field['name'], $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/page_link/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+
+ // add archives to $results
+ if ( $field['allow_archives'] && $args['paged'] == 1 ) {
+
+ // Generate unique list of URLs.
+ $links = array();
+ $links[] = home_url();
+ foreach ( $args['post_type'] as $post_type ) {
+ $links[] = get_post_type_archive_link( $post_type );
+ }
+ $links = array_filter( $links );
+ $links = array_unique( $links );
+
+ // Convert list into choices.
+ $children = array();
+ foreach ( $links as $link ) {
+
+ // Ignore if search does not match.
+ if ( $is_search && stripos( $link, $s ) === false ) {
+ continue;
+ }
+ $children[] = array(
+ 'id' => $link,
+ 'text' => $link,
+ );
+ }
+ if ( $children ) {
+ $results[] = array(
+ 'text' => __( 'Archives', 'acf' ),
+ 'children' => $children,
+ );
+ }
+ }
+
+ // get posts grouped by post type
+ $groups = acf_get_grouped_posts( $args );
+
+ // loop
+ if ( ! empty( $groups ) ) {
+
+ foreach ( array_keys( $groups ) as $group_title ) {
+
+ // vars
+ $posts = acf_extract_var( $groups, $group_title );
+
+ // data
+ $data = array(
+ 'text' => $group_title,
+ 'children' => array(),
+ );
+
+ // convert post objects to post titles
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
+
+ }
+
+ // order posts by search
+ if ( $is_search && empty( $args['orderby'] ) && isset( $args['s'] ) ) {
+
+ $posts = acf_order_by_search( $posts, $args['s'] );
+
+ }
+
+ // append to $data
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ] );
+
+ }
+
+ // append to $results
+ $results[] = $data;
+
+ }
+ }
+
+ // return
+ acf_send_ajax_results(
+ array(
+ 'results' => $results,
+ 'limit' => $args['posts_per_page'],
+ )
+ );
+
}
-
-
- // convert back from array if neccessary
- if( !$field['multiple'] ) {
-
- $value = array_shift($value);
-
+
+
+ /*
+ * get_post_result
+ *
+ * This function will return an array containing id, text and maybe description data
+ *
+ * @type function
+ * @date 7/07/2016
+ * @since 5.4.0
+ *
+ * @param $id (mixed)
+ * @param $text (string)
+ * @return (array)
+ */
+
+ function get_post_result( $id, $text ) {
+
+ // vars
+ $result = array(
+ 'id' => $id,
+ 'text' => $text,
+ );
+
+ // look for parent
+ $search = '| ' . __( 'Parent', 'acf' ) . ':';
+ $pos = strpos( $text, $search );
+
+ if ( $pos !== false ) {
+
+ $result['description'] = substr( $text, $pos + 2 );
+ $result['text'] = substr( $text, 0, $pos );
+
+ }
+
+ // return
+ return $result;
+
}
-
-
- // return value
- return $value;
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $post_id - the $post_id of which the value will be saved
- * @param $field - the field array holding all the field options
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // Bail early if no value.
- if( empty($value) ) {
+
+
+ /*
+ * get_post_title
+ *
+ * This function returns the HTML for a result
+ *
+ * @type function
+ * @date 1/11/2013
+ * @since 5.0.0
+ *
+ * @param $post (object)
+ * @param $field (array)
+ * @param $post_id (int) the post_id to which this value is saved to
+ * @return (string)
+ */
+
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
+
+ // get post_id
+ if ( ! $post_id ) {
+ $post_id = acf_get_form_data( 'post_id' );
+ }
+
+ // vars
+ $title = acf_get_post_title( $post, $is_search );
+
+ // filters
+ $title = apply_filters( 'acf/fields/page_link/result', $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/page_link/result/name=' . $field['_name'], $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/page_link/result/key=' . $field['key'], $title, $post, $field, $post_id );
+
+ // return
+ return $title;
+
+ }
+
+
+ /*
+ * get_posts
+ *
+ * This function will return an array of posts for a given field value
+ *
+ * @type function
+ * @date 13/06/2014
+ * @since 5.0.0
+ *
+ * @param $value (array)
+ * @return $value
+ */
+
+ function get_posts( $value, $field ) {
+
+ // force value to array
+ $value = acf_get_array( $value );
+
+ // get selected post ID's
+ $post__in = array();
+
+ foreach ( $value as $k => $v ) {
+
+ if ( is_numeric( $v ) ) {
+
+ // append to $post__in
+ $post__in[] = (int) $v;
+
+ }
+ }
+
+ // bail early if no posts
+ if ( empty( $post__in ) ) {
+
+ return $value;
+
+ }
+
+ // get posts
+ $posts = acf_get_posts(
+ array(
+ 'post__in' => $post__in,
+ 'post_type' => $field['post_type'],
+ )
+ );
+
+ // override value with post
+ $return = array();
+
+ // append to $return
+ foreach ( $value as $k => $v ) {
+
+ if ( is_numeric( $v ) ) {
+
+ // extract first post
+ $post = array_shift( $posts );
+
+ // append
+ if ( $post ) {
+
+ $return[] = $post;
+
+ }
+ } else {
+
+ $return[] = $v;
+
+ }
+ }
+
+ // return
+ return $return;
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // Change Field into a select
+ $field['type'] = 'select';
+ $field['ui'] = 1;
+ $field['ajax'] = 1;
+ $field['choices'] = array();
+
+ // populate choices if value exists
+ if ( ! empty( $field['value'] ) ) {
+
+ // get posts
+ $posts = $this->get_posts( $field['value'], $field );
+
+ // set choices
+ if ( ! empty( $posts ) ) {
+
+ foreach ( array_keys( $posts ) as $i ) {
+
+ // vars
+ $post = acf_extract_var( $posts, $i );
+
+ if ( is_object( $post ) ) {
+
+ // append to choices
+ $field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
+
+ } else {
+
+ // append to choices
+ $field['choices'][ $post ] = $post;
+
+ }
+ }
+ }
+ }
+
+ // render
+ acf_render_field( $field );
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // post_type
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Post Type', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'post_type',
+ 'choices' => acf_get_pretty_post_types(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All post types', 'acf' ),
+ )
+ );
+
+ // taxonomy
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Taxonomy', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'taxonomy',
+ 'choices' => acf_get_taxonomy_terms(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All taxonomies', 'acf' ),
+ )
+ );
+
+ // allow_null
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Allow Null?', 'acf' ),
+ 'instructions' => '',
+ 'name' => 'allow_null',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ // allow_archives
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Allow Archives URLs', 'acf' ),
+ 'instructions' => '',
+ 'name' => 'allow_archives',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ // multiple
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Select multiple values?', 'acf' ),
+ 'instructions' => '',
+ 'name' => 'multiple',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // ACF4 null
+ if ( $value === 'null' ) {
+
+ return false;
+
+ }
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+
+ return $value;
+
+ }
+
+ // get posts
+ $value = $this->get_posts( $value, $field );
+
+ // set choices
+ foreach ( array_keys( $value ) as $i ) {
+
+ // vars
+ $post = acf_extract_var( $value, $i );
+
+ // convert $post to permalink
+ if ( is_object( $post ) ) {
+
+ $post = get_permalink( $post );
+
+ }
+
+ // append back to $value
+ $value[ $i ] = $post;
+
+ }
+
+ // convert back from array if neccessary
+ if ( ! $field['multiple'] ) {
+
+ $value = array_shift( $value );
+
+ }
+
+ // return value
+ return $value;
+
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // Bail early if no value.
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // Format array of values.
+ // - ensure each value is an id.
+ // - Parse each id as string for SQL LIKE queries.
+ if ( acf_is_sequential_array( $value ) ) {
+ $value = array_map( 'acf_maybe_idval', $value );
+ $value = array_map( 'strval', $value );
+
+ // Parse single value for id.
+ } else {
+ $value = acf_maybe_idval( $value );
+ }
+
+ // Return value.
return $value;
}
-
- // Format array of values.
- // - ensure each value is an id.
- // - Parse each id as string for SQL LIKE queries.
- if( acf_is_sequential_array($value) ) {
- $value = array_map('acf_maybe_idval', $value);
- $value = array_map('strval', $value);
-
- // Parse single value for id.
- } else {
- $value = acf_maybe_idval( $value );
- }
-
- // Return value.
- return $value;
+
}
-
-}
-// initialize
-acf_register_field_type( 'acf_field_page_link' );
+ // initialize
+ acf_register_field_type( 'acf_field_page_link' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-password.php b/includes/fields/class-acf-field-password.php
index cb0efe2..100a108 100644
--- a/includes/fields/class-acf-field-password.php
+++ b/includes/fields/class-acf-field-password.php
@@ -1,104 +1,111 @@
name = 'password';
- $this->label = __("Password",'acf');
- $this->defaults = array(
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- acf_get_field_type('text')->render_field( $field );
-
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- function render_field_settings( $field ) {
-
- // placeholder
- 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'),
- 'type' => 'text',
- 'name' => 'prepend',
- ));
-
-
- // append
- acf_render_field_setting( $field, array(
- 'label' => __('Append','acf'),
- 'instructions' => __('Appears after the input','acf'),
- 'type' => 'text',
- 'name' => 'append',
- ));
- }
-
-}
+ class acf_field_password extends acf_field {
-// initialize
-acf_register_field_type( 'acf_field_password' );
+ /*
+ * initialize
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'password';
+ $this->label = __( 'Password', 'acf' );
+ $this->defaults = array(
+ 'placeholder' => '',
+ 'prepend' => '',
+ 'append' => '',
+ );
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ acf_get_field_type( 'text' )->render_field( $field );
+
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // placeholder
+ 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' ),
+ 'type' => 'text',
+ 'name' => 'prepend',
+ )
+ );
+
+ // append
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Append', 'acf' ),
+ 'instructions' => __( 'Appears after the input', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'append',
+ )
+ );
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_password' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-post_object.php b/includes/fields/class-acf-field-post_object.php
index f41d248..d1d47e4 100644
--- a/includes/fields/class-acf-field-post_object.php
+++ b/includes/fields/class-acf-field-post_object.php
@@ -1,603 +1,591 @@
name = 'post_object';
- $this->label = __("Post Object",'acf');
- $this->category = 'relational';
- $this->defaults = array(
- 'post_type' => array(),
- 'taxonomy' => array(),
- 'allow_null' => 0,
- 'multiple' => 0,
- 'return_format' => 'object',
- 'ui' => 1,
- );
-
-
- // extra
- add_action('wp_ajax_acf/fields/post_object/query', array($this, 'ajax_query'));
- add_action('wp_ajax_nopriv_acf/fields/post_object/query', array($this, 'ajax_query'));
-
- }
-
-
- /*
- * ajax_query
- *
- * description
- *
- * @type function
- * @date 24/10/13
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function ajax_query() {
-
- // validate
- if( !acf_verify_ajax() ) die();
-
-
- // get choices
- $response = $this->get_ajax_query( $_POST );
-
-
- // return
- acf_send_ajax_results($response);
-
- }
-
-
- /*
- * get_ajax_query
- *
- * This function will return an array of data formatted for use in a select2 AJAX response
- *
- * @type function
- * @date 15/10/2014
- * @since 5.0.9
- *
- * @param $options (array)
- * @return (array)
- */
-
- function get_ajax_query( $options = array() ) {
-
- // defaults
- $options = acf_parse_args($options, array(
- 'post_id' => 0,
- 's' => '',
- 'field_key' => '',
- 'paged' => 1
- ));
-
-
- // load field
- $field = acf_get_field( $options['field_key'] );
- if( !$field ) return false;
-
-
- // vars
- $results = array();
- $args = array();
- $s = false;
- $is_search = false;
-
-
- // paged
- $args['posts_per_page'] = 20;
- $args['paged'] = $options['paged'];
-
-
- // search
- if( $options['s'] !== '' ) {
-
- // strip slashes (search may be integer)
- $s = wp_unslash( strval($options['s']) );
-
-
- // update vars
- $args['s'] = $s;
- $is_search = true;
-
- }
-
-
- // post_type
- if( !empty($field['post_type']) ) {
-
- $args['post_type'] = acf_get_array( $field['post_type'] );
-
- } else {
-
- $args['post_type'] = acf_get_post_types();
-
- }
-
-
- // taxonomy
- if( !empty($field['taxonomy']) ) {
-
// vars
- $terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
-
-
- // append to $args
- $args['tax_query'] = array();
-
-
- // now create the tax queries
- foreach( $terms as $k => $v ) {
-
- $args['tax_query'][] = array(
- 'taxonomy' => $k,
- 'field' => 'slug',
- 'terms' => $v,
- );
-
- }
-
- }
-
-
- // filters
- $args = apply_filters('acf/fields/post_object/query', $args, $field, $options['post_id']);
- $args = apply_filters('acf/fields/post_object/query/name=' . $field['name'], $args, $field, $options['post_id'] );
- $args = apply_filters('acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-
-
- // get posts grouped by post type
- $groups = acf_get_grouped_posts( $args );
-
-
- // bail early if no posts
- if( empty($groups) ) return false;
-
-
- // loop
- foreach( array_keys($groups) as $group_title ) {
-
- // vars
- $posts = acf_extract_var( $groups, $group_title );
-
-
- // data
- $data = array(
- 'text' => $group_title,
- 'children' => array()
+ $this->name = 'post_object';
+ $this->label = __( 'Post Object', 'acf' );
+ $this->category = 'relational';
+ $this->defaults = array(
+ 'post_type' => array(),
+ 'taxonomy' => array(),
+ 'allow_null' => 0,
+ 'multiple' => 0,
+ 'return_format' => 'object',
+ 'ui' => 1,
);
-
-
- // convert post objects to post titles
- foreach( array_keys($posts) as $post_id ) {
-
- $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
-
- }
-
-
- // order posts by search
- if( $is_search && empty($args['orderby']) && isset($args['s']) ) {
-
- $posts = acf_order_by_search( $posts, $args['s'] );
-
- }
-
-
- // append to $data
- foreach( array_keys($posts) as $post_id ) {
-
- $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
-
- }
-
-
- // append to $results
- $results[] = $data;
-
- }
-
-
- // optgroup or single
- $post_type = acf_get_array( $args['post_type'] );
- if( count($post_type) == 1 ) {
- $results = $results[0]['children'];
- }
-
-
- // vars
- $response = array(
- 'results' => $results,
- 'limit' => $args['posts_per_page']
- );
-
-
- // return
- return $response;
-
- }
-
-
- /*
- * get_post_result
- *
- * This function will return an array containing id, text and maybe description data
- *
- * @type function
- * @date 7/07/2016
- * @since 5.4.0
- *
- * @param $id (mixed)
- * @param $text (string)
- * @return (array)
- */
-
- function get_post_result( $id, $text ) {
-
- // vars
- $result = array(
- 'id' => $id,
- 'text' => $text
- );
-
-
- // look for parent
- $search = '| ' . __('Parent', 'acf') . ':';
- $pos = strpos($text, $search);
-
- if( $pos !== false ) {
-
- $result['description'] = substr($text, $pos+2);
- $result['text'] = substr($text, 0, $pos);
-
- }
-
-
- // return
- return $result;
-
- }
-
-
- /*
- * get_post_title
- *
- * This function returns the HTML for a result
- *
- * @type function
- * @date 1/11/2013
- * @since 5.0.0
- *
- * @param $post (object)
- * @param $field (array)
- * @param $post_id (int) the post_id to which this value is saved to
- * @return (string)
- */
-
- function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
-
- // get post_id
- if( !$post_id ) $post_id = acf_get_form_data('post_id');
-
-
- // vars
- $title = acf_get_post_title( $post, $is_search );
-
-
- // filters
- $title = apply_filters('acf/fields/post_object/result', $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/post_object/result/name=' . $field['_name'], $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/post_object/result/key=' . $field['key'], $title, $post, $field, $post_id);
-
-
- // return
- return $title;
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // Change Field into a select
- $field['type'] = 'select';
- $field['ui'] = 1;
- $field['ajax'] = 1;
- $field['choices'] = array();
-
-
- // load posts
- $posts = $this->get_posts( $field['value'], $field );
-
- if( $posts ) {
-
- foreach( array_keys($posts) as $i ) {
-
- // vars
- $post = acf_extract_var( $posts, $i );
-
-
- // append to choices
- $field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
-
- }
-
+
+ // extra
+ add_action( 'wp_ajax_acf/fields/post_object/query', array( $this, 'ajax_query' ) );
+ add_action( 'wp_ajax_nopriv_acf/fields/post_object/query', array( $this, 'ajax_query' ) );
+
}
-
- // render
- acf_render_field( $field );
-
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- function render_field_settings( $field ) {
-
- // default_value
- acf_render_field_setting( $field, array(
- 'label' => __('Filter by Post Type','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'post_type',
- 'choices' => acf_get_pretty_post_types(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All post types",'acf'),
- ));
-
-
- // default_value
- acf_render_field_setting( $field, array(
- 'label' => __('Filter by Taxonomy','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'taxonomy',
- 'choices' => acf_get_taxonomy_terms(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All taxonomies",'acf'),
- ));
-
-
- // allow_null
- acf_render_field_setting( $field, array(
- 'label' => __('Allow Null?','acf'),
- 'instructions' => '',
- 'name' => 'allow_null',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
-
- // multiple
- acf_render_field_setting( $field, array(
- 'label' => __('Select multiple values?','acf'),
- 'instructions' => '',
- 'name' => 'multiple',
- 'type' => 'true_false',
- 'ui' => 1,
- ));
-
-
- // return_format
- acf_render_field_setting( $field, array(
- 'label' => __('Return Format','acf'),
- 'instructions' => '',
- 'type' => 'radio',
- 'name' => 'return_format',
- 'choices' => array(
- 'object' => __("Post Object",'acf'),
- 'id' => __("Post ID",'acf'),
- ),
- 'layout' => 'horizontal',
- ));
-
- }
-
-
- /*
- * load_value()
- *
- * This filter is applied to the $value after it is loaded from the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value found in the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- * @return $value
- */
-
- function load_value( $value, $post_id, $field ) {
-
- // ACF4 null
- if( $value === 'null' ) return false;
-
-
- // return
- return $value;
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // numeric
- $value = acf_get_numeric($value);
-
-
- // bail early if no value
- if( empty($value) ) return false;
-
-
- // load posts if needed
- if( $field['return_format'] == 'object' ) {
-
- $value = $this->get_posts( $value, $field );
-
+
+ /*
+ * ajax_query
+ *
+ * description
+ *
+ * @type function
+ * @date 24/10/13
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function ajax_query() {
+
+ // validate
+ if ( ! acf_verify_ajax() ) {
+ die();
+ }
+
+ // get choices
+ $response = $this->get_ajax_query( $_POST );
+
+ // return
+ acf_send_ajax_results( $response );
+
}
-
-
- // convert back from array if neccessary
- if( !$field['multiple'] && is_array($value) ) {
-
- $value = current($value);
-
+
+
+ /*
+ * get_ajax_query
+ *
+ * This function will return an array of data formatted for use in a select2 AJAX response
+ *
+ * @type function
+ * @date 15/10/2014
+ * @since 5.0.9
+ *
+ * @param $options (array)
+ * @return (array)
+ */
+
+ function get_ajax_query( $options = array() ) {
+
+ // defaults
+ $options = acf_parse_args(
+ $options,
+ array(
+ 'post_id' => 0,
+ 's' => '',
+ 'field_key' => '',
+ 'paged' => 1,
+ )
+ );
+
+ // load field
+ $field = acf_get_field( $options['field_key'] );
+ if ( ! $field ) {
+ return false;
+ }
+
+ // vars
+ $results = array();
+ $args = array();
+ $s = false;
+ $is_search = false;
+
+ // paged
+ $args['posts_per_page'] = 20;
+ $args['paged'] = $options['paged'];
+
+ // search
+ if ( $options['s'] !== '' ) {
+
+ // strip slashes (search may be integer)
+ $s = wp_unslash( strval( $options['s'] ) );
+
+ // update vars
+ $args['s'] = $s;
+ $is_search = true;
+
+ }
+
+ // post_type
+ if ( ! empty( $field['post_type'] ) ) {
+
+ $args['post_type'] = acf_get_array( $field['post_type'] );
+
+ } else {
+
+ $args['post_type'] = acf_get_post_types();
+
+ }
+
+ // taxonomy
+ if ( ! empty( $field['taxonomy'] ) ) {
+
+ // vars
+ $terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
+
+ // append to $args
+ $args['tax_query'] = array();
+
+ // now create the tax queries
+ foreach ( $terms as $k => $v ) {
+
+ $args['tax_query'][] = array(
+ 'taxonomy' => $k,
+ 'field' => 'slug',
+ 'terms' => $v,
+ );
+
+ }
+ }
+
+ // filters
+ $args = apply_filters( 'acf/fields/post_object/query', $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/post_object/query/name=' . $field['name'], $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+
+ // get posts grouped by post type
+ $groups = acf_get_grouped_posts( $args );
+
+ // bail early if no posts
+ if ( empty( $groups ) ) {
+ return false;
+ }
+
+ // loop
+ foreach ( array_keys( $groups ) as $group_title ) {
+
+ // vars
+ $posts = acf_extract_var( $groups, $group_title );
+
+ // data
+ $data = array(
+ 'text' => $group_title,
+ 'children' => array(),
+ );
+
+ // convert post objects to post titles
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
+
+ }
+
+ // order posts by search
+ if ( $is_search && empty( $args['orderby'] ) && isset( $args['s'] ) ) {
+
+ $posts = acf_order_by_search( $posts, $args['s'] );
+
+ }
+
+ // append to $data
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ] );
+
+ }
+
+ // append to $results
+ $results[] = $data;
+
+ }
+
+ // optgroup or single
+ $post_type = acf_get_array( $args['post_type'] );
+ if ( count( $post_type ) == 1 ) {
+ $results = $results[0]['children'];
+ }
+
+ // vars
+ $response = array(
+ 'results' => $results,
+ 'limit' => $args['posts_per_page'],
+ );
+
+ // return
+ return $response;
+
}
-
-
- // return value
- return $value;
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is appied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $post_id - the $post_id of which the value will be saved
- * @param $field - the field array holding all the field options
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // Bail early if no value.
- if( empty($value) ) {
+
+
+ /*
+ * get_post_result
+ *
+ * This function will return an array containing id, text and maybe description data
+ *
+ * @type function
+ * @date 7/07/2016
+ * @since 5.4.0
+ *
+ * @param $id (mixed)
+ * @param $text (string)
+ * @return (array)
+ */
+
+ function get_post_result( $id, $text ) {
+
+ // vars
+ $result = array(
+ 'id' => $id,
+ 'text' => $text,
+ );
+
+ // look for parent
+ $search = '| ' . __( 'Parent', 'acf' ) . ':';
+ $pos = strpos( $text, $search );
+
+ if ( $pos !== false ) {
+
+ $result['description'] = substr( $text, $pos + 2 );
+ $result['text'] = substr( $text, 0, $pos );
+
+ }
+
+ // return
+ return $result;
+
+ }
+
+
+ /*
+ * get_post_title
+ *
+ * This function returns the HTML for a result
+ *
+ * @type function
+ * @date 1/11/2013
+ * @since 5.0.0
+ *
+ * @param $post (object)
+ * @param $field (array)
+ * @param $post_id (int) the post_id to which this value is saved to
+ * @return (string)
+ */
+
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
+
+ // get post_id
+ if ( ! $post_id ) {
+ $post_id = acf_get_form_data( 'post_id' );
+ }
+
+ // vars
+ $title = acf_get_post_title( $post, $is_search );
+
+ // filters
+ $title = apply_filters( 'acf/fields/post_object/result', $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/post_object/result/name=' . $field['_name'], $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/post_object/result/key=' . $field['key'], $title, $post, $field, $post_id );
+
+ // return
+ return $title;
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // Change Field into a select
+ $field['type'] = 'select';
+ $field['ui'] = 1;
+ $field['ajax'] = 1;
+ $field['choices'] = array();
+
+ // load posts
+ $posts = $this->get_posts( $field['value'], $field );
+
+ if ( $posts ) {
+
+ foreach ( array_keys( $posts ) as $i ) {
+
+ // vars
+ $post = acf_extract_var( $posts, $i );
+
+ // append to choices
+ $field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
+
+ }
+ }
+
+ // render
+ acf_render_field( $field );
+
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // default_value
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Post Type', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'post_type',
+ 'choices' => acf_get_pretty_post_types(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All post types', 'acf' ),
+ )
+ );
+
+ // default_value
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Taxonomy', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'taxonomy',
+ 'choices' => acf_get_taxonomy_terms(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All taxonomies', 'acf' ),
+ )
+ );
+
+ // allow_null
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Allow Null?', 'acf' ),
+ 'instructions' => '',
+ 'name' => 'allow_null',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ // multiple
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Select multiple values?', 'acf' ),
+ 'instructions' => '',
+ 'name' => 'multiple',
+ 'type' => 'true_false',
+ 'ui' => 1,
+ )
+ );
+
+ // return_format
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Return Format', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'choices' => array(
+ 'object' => __( 'Post Object', 'acf' ),
+ 'id' => __( 'Post ID', 'acf' ),
+ ),
+ 'layout' => 'horizontal',
+ )
+ );
+
+ }
+
+
+ /*
+ * load_value()
+ *
+ * This filter is applied to the $value after it is loaded from the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value found in the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ * @return $value
+ */
+
+ function load_value( $value, $post_id, $field ) {
+
+ // ACF4 null
+ if ( $value === 'null' ) {
+ return false;
+ }
+
+ // return
+ return $value;
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // numeric
+ $value = acf_get_numeric( $value );
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return false;
+ }
+
+ // load posts if needed
+ if ( $field['return_format'] == 'object' ) {
+
+ $value = $this->get_posts( $value, $field );
+
+ }
+
+ // convert back from array if neccessary
+ if ( ! $field['multiple'] && is_array( $value ) ) {
+
+ $value = current( $value );
+
+ }
+
+ // return value
+ return $value;
+
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is appied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // Bail early if no value.
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // Format array of values.
+ // - ensure each value is an id.
+ // - Parse each id as string for SQL LIKE queries.
+ if ( acf_is_sequential_array( $value ) ) {
+ $value = array_map( 'acf_idval', $value );
+ $value = array_map( 'strval', $value );
+
+ // Parse single value for id.
+ } else {
+ $value = acf_idval( $value );
+ }
+
+ // Return value.
return $value;
}
-
- // Format array of values.
- // - ensure each value is an id.
- // - Parse each id as string for SQL LIKE queries.
- if( acf_is_sequential_array($value) ) {
- $value = array_map('acf_idval', $value);
- $value = array_map('strval', $value);
-
- // Parse single value for id.
- } else {
- $value = acf_idval( $value );
+
+
+ /*
+ * get_posts
+ *
+ * This function will return an array of posts for a given field value
+ *
+ * @type function
+ * @date 13/06/2014
+ * @since 5.0.0
+ *
+ * @param $value (array)
+ * @return $value
+ */
+
+ function get_posts( $value, $field ) {
+
+ // numeric
+ $value = acf_get_numeric( $value );
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+ return false;
+ }
+
+ // get posts
+ $posts = acf_get_posts(
+ array(
+ 'post__in' => $value,
+ 'post_type' => $field['post_type'],
+ )
+ );
+
+ // return
+ return $posts;
+
}
-
- // Return value.
- return $value;
+
}
-
-
- /*
- * get_posts
- *
- * This function will return an array of posts for a given field value
- *
- * @type function
- * @date 13/06/2014
- * @since 5.0.0
- *
- * @param $value (array)
- * @return $value
- */
-
- function get_posts( $value, $field ) {
-
- // numeric
- $value = acf_get_numeric($value);
-
-
- // bail early if no value
- if( empty($value) ) return false;
-
-
- // get posts
- $posts = acf_get_posts(array(
- 'post__in' => $value,
- 'post_type' => $field['post_type']
- ));
-
-
- // return
- return $posts;
-
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field_post_object' );
+ // initialize
+ acf_register_field_type( 'acf_field_post_object' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-radio.php b/includes/fields/class-acf-field-radio.php
index c3c18f6..71583be 100644
--- a/includes/fields/class-acf-field-radio.php
+++ b/includes/fields/class-acf-field-radio.php
@@ -1,448 +1,454 @@
name = 'radio';
- $this->label = __("Radio Button",'acf');
- $this->category = 'choice';
- $this->defaults = array(
- 'layout' => 'vertical',
- 'choices' => array(),
- 'default_value' => '',
- 'other_choice' => 0,
- 'save_other_choice' => 0,
- 'allow_null' => 0,
- 'return_format' => 'value'
- );
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field (array) the $field being rendered
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field (array) the $field being edited
- * @return n/a
- */
-
- function render_field( $field ) {
+ class acf_field_radio extends acf_field {
- // vars
- $e = '';
- $ul = array(
- 'class' => 'acf-radio-list',
- 'data-allow_null' => $field['allow_null'],
- 'data-other_choice' => $field['other_choice']
- );
-
-
- // append to class
- $ul['class'] .= ' ' . ($field['layout'] == 'horizontal' ? 'acf-hl' : 'acf-bl');
- $ul['class'] .= ' ' . $field['class'];
-
-
- // Determine selected value.
- $value = (string) $field['value'];
-
- // 1. Selected choice.
- if( isset( $field['choices'][ $value ] ) ) {
- $checked = (string) $value;
-
- // 2. Custom choice.
- } elseif( $field['other_choice'] && $value !== '' ) {
- $checked = 'other';
-
- // 3. Empty choice.
- } elseif( $field['allow_null'] ) {
- $checked = '';
-
- // 4. Default to first choice.
- } else {
- $checked = (string) key( $field['choices'] );
- }
-
- // other choice
- $other_input = false;
- if( $field['other_choice'] ) {
-
- // Define other input attrs.
- $other_input = array(
- 'type' => 'text',
- 'name' => $field['name'],
- 'value' => '',
- 'disabled' => 'disabled',
- 'class' => 'acf-disabled'
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'radio';
+ $this->label = __( 'Radio Button', 'acf' );
+ $this->category = 'choice';
+ $this->defaults = array(
+ 'layout' => 'vertical',
+ 'choices' => array(),
+ 'default_value' => '',
+ 'other_choice' => 0,
+ 'save_other_choice' => 0,
+ 'allow_null' => 0,
+ 'return_format' => 'value',
);
-
- // Select other choice if value is not a valid choice.
- if( $checked === 'other' ) {
- unset( $other_input['disabled'] );
- $other_input['value'] = $field['value'];
- }
-
- // Ensure an 'other' choice is defined.
- if( !isset( $field['choices']['other'] ) ) {
- $field['choices']['other'] = '';
- }
+
}
-
- // Bail early if no choices.
- if( empty( $field['choices'] ) ) {
- return;
- }
-
- // Hiden input.
- $e .= acf_get_hidden_input( array('name' => $field['name']) );
-
- // Open
- wp_oembed_get($field['value'], $field['width'], $field['height']);
- } ?>
+ wp_oembed_get( $field['value'], $field['width'], $field['height'] );
+ }
+ ?>
- .
- $e .= '
- ';
-
- // Loop through choices.
- foreach( $field['choices'] as $value => $label ) {
- $is_selected = false;
-
- // Ensure value is a string.
- $value = (string) $value;
-
- // Define input attrs.
- $attrs = array(
- 'type' => 'radio',
- 'id' => sanitize_title( $field['id'] . '-' . $value ),
- 'name' => $field['name'],
- 'value' => $value
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field (array) the $field being rendered
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field (array) the $field being edited
+ * @return n/a
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $e = '';
+ $ul = array(
+ 'class' => 'acf-radio-list',
+ 'data-allow_null' => $field['allow_null'],
+ 'data-other_choice' => $field['other_choice'],
);
-
- // Check if selected.
- if( esc_attr($value) === esc_attr($checked) ) {
- $attrs['checked'] = 'checked';
- $is_selected = true;
+
+ // append to class
+ $ul['class'] .= ' ' . ( $field['layout'] == 'horizontal' ? 'acf-hl' : 'acf-bl' );
+ $ul['class'] .= ' ' . $field['class'];
+
+ // Determine selected value.
+ $value = (string) $field['value'];
+
+ // 1. Selected choice.
+ if ( isset( $field['choices'][ $value ] ) ) {
+ $checked = (string) $value;
+
+ // 2. Custom choice.
+ } elseif ( $field['other_choice'] && $value !== '' ) {
+ $checked = 'other';
+
+ // 3. Empty choice.
+ } elseif ( $field['allow_null'] ) {
+ $checked = '';
+
+ // 4. Default to first choice.
+ } else {
+ $checked = (string) key( $field['choices'] );
}
-
- // Check if is disabled.
- if( isset($field['disabled']) && acf_in_array($value, $field['disabled']) ) {
- $attrs['disabled'] = 'disabled';
+
+ // other choice
+ $other_input = false;
+ if ( $field['other_choice'] ) {
+
+ // Define other input attrs.
+ $other_input = array(
+ 'type' => 'text',
+ 'name' => $field['name'],
+ 'value' => '',
+ 'disabled' => 'disabled',
+ 'class' => 'acf-disabled',
+ );
+
+ // Select other choice if value is not a valid choice.
+ if ( $checked === 'other' ) {
+ unset( $other_input['disabled'] );
+ $other_input['value'] = $field['value'];
+ }
+
+ // Ensure an 'other' choice is defined.
+ if ( ! isset( $field['choices']['other'] ) ) {
+ $field['choices']['other'] = '';
+ }
}
-
- // Additional HTML (the "Other" input).
- $additional_html = '';
- if( $value === 'other' && $other_input ) {
- $additional_html = ' ' . acf_get_text_input( $other_input );
+
+ // Bail early if no choices.
+ if ( empty( $field['choices'] ) ) {
+ return;
}
-
- // append
- $e .= '
- .
+ $e .= '
- ';
+
+ // Loop through choices.
+ foreach ( $field['choices'] as $value => $label ) {
+ $is_selected = false;
+
+ // Ensure value is a string.
+ $value = (string) $value;
+
+ // Define input attrs.
+ $attrs = array(
+ 'type' => 'radio',
+ 'id' => sanitize_title( $field['id'] . '-' . $value ),
+ 'name' => $field['name'],
+ 'value' => $value,
+ );
+
+ // Check if selected.
+ if ( esc_attr( $value ) === esc_attr( $checked ) ) {
+ $attrs['checked'] = 'checked';
+ $is_selected = true;
+ }
+
+ // Check if is disabled.
+ if ( isset( $field['disabled'] ) && acf_in_array( $value, $field['disabled'] ) ) {
+ $attrs['disabled'] = 'disabled';
+ }
+
+ // Additional HTML (the "Other" input).
+ $additional_html = '';
+ if ( $value === 'other' && $other_input ) {
+ $additional_html = ' ' . acf_get_text_input( $other_input );
+ }
+
+ // append
+ $e .= '
- .
+ $e .= '
- .
- $e .= '
' . __('For more control, you may specify both a value and label like this:','acf'). '
' . __('red : Red','acf'), - 'type' => 'textarea', - 'name' => 'choices', - )); - - - // allow_null - acf_render_field_setting( $field, array( - 'label' => __('Allow Null?','acf'), - 'instructions' => '', - 'name' => 'allow_null', - 'type' => 'true_false', - 'ui' => 1, - )); - - - // other_choice - acf_render_field_setting( $field, array( - 'label' => __('Other','acf'), - 'instructions' => '', - 'name' => 'other_choice', - 'type' => 'true_false', - 'ui' => 1, - 'message' => __("Add 'other' choice to allow for custom values", 'acf'), - )); - - - // save_other_choice - acf_render_field_setting( $field, array( - 'label' => __('Save Other','acf'), - 'instructions' => '', - 'name' => 'save_other_choice', - 'type' => 'true_false', - 'ui' => 1, - 'message' => __("Save 'other' values to the field's choices", 'acf'), - 'conditions' => array( - 'field' => 'other_choice', - 'operator' => '==', - 'value' => 1 - ) - )); - - - // default_value - acf_render_field_setting( $field, array( - 'label' => __('Default Value','acf'), - 'instructions' => __('Appears when creating a new post','acf'), - 'type' => 'text', - 'name' => 'default_value', - )); - - - // layout - acf_render_field_setting( $field, array( - 'label' => __('Layout','acf'), - 'instructions' => '', - 'type' => 'radio', - 'name' => 'layout', - 'layout' => 'horizontal', - 'choices' => array( - 'vertical' => __("Vertical",'acf'), - 'horizontal' => __("Horizontal",'acf') - ) - )); - - - // return_format - 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( - 'value' => __('Value','acf'), - 'label' => __('Label','acf'), - 'array' => __('Both (Array)','acf') - ) - )); - - } - - - /* - * update_field() - * - * This filter is appied to the $field before it is saved to the database - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $field - the field array holding all the field options - * @param $post_id - the field group ID (post_type = acf) - * - * @return $field - the modified field - */ - function update_field( $field ) { - - // decode choices (convert to array) - $field['choices'] = acf_decode_choices($field['choices']); - - - // return - return $field; - } - - - /* - * update_value() - * - * This filter is appied to the $value before it is updated in the db - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * @todo Fix bug where $field was found via json and has no ID - * - * @param $value - the value which will be saved in the database - * @param $post_id - the $post_id of which the value will be saved - * @param $field - the field array holding all the field options - * - * @return $value - the modified value - */ - - function update_value( $value, $post_id, $field ) { - - // bail early if no value (allow 0 to be saved) - if( !$value && !is_numeric($value) ) return $value; - - - // save_other_choice - if( $field['save_other_choice'] ) { - - // value isn't in choices yet - if( !isset($field['choices'][ $value ]) ) { - - // get raw $field (may have been changed via repeater field) - // if field is local, it won't have an ID - $selector = $field['ID'] ? $field['ID'] : $field['key']; - $field = acf_get_field( $selector, true ); - - - // bail early if no ID (JSON only) - if( !$field['ID'] ) return $value; - - - // unslash (fixes serialize single quote issue) - $value = wp_unslash($value); - - - // sanitize (remove tags) - $value = sanitize_text_field($value); - - - // update $field - $field['choices'][ $value ] = $value; - - - // save - acf_update_field( $field ); - - } - - } - - - // return - return $value; - } - - - /* - * load_value() - * - * This filter is appied to the $value after it is loaded from the db - * - * @type filter - * @since 5.2.9 - * @date 23/01/13 - * - * @param $value - the value found in the database - * @param $post_id - the $post_id from which the value was loaded from - * @param $field - the field array holding all the field options - * - * @return $value - the value to be saved in te database - */ - - function load_value( $value, $post_id, $field ) { - - // must be single value - if( is_array($value) ) { - - $value = array_pop($value); - + + /* + * render_field_settings() + * + * Create extra options for your field. This is rendered when editing a field. + * The value of $field['name'] can be used (like bellow) to save extra data to the $field + * + * @type action + * @since 3.6 + * @date 23/01/13 + * + * @param $field - an array holding all the field's data + */ + + function render_field_settings( $field ) { + + // encode choices (convert from array) + $field['choices'] = acf_encode_choices( $field['choices'] ); + + // choices + acf_render_field_setting( + $field, + array( + 'label' => __( 'Choices', 'acf' ), + 'instructions' => __( 'Enter each choice on a new line.', 'acf' ) . '
' . __( 'For more control, you may specify both a value and label like this:', 'acf' ) . '
' . __( 'red : Red', 'acf' ), + 'type' => 'textarea', + 'name' => 'choices', + ) + ); + + // allow_null + acf_render_field_setting( + $field, + array( + 'label' => __( 'Allow Null?', 'acf' ), + 'instructions' => '', + 'name' => 'allow_null', + 'type' => 'true_false', + 'ui' => 1, + ) + ); + + // other_choice + acf_render_field_setting( + $field, + array( + 'label' => __( 'Other', 'acf' ), + 'instructions' => '', + 'name' => 'other_choice', + 'type' => 'true_false', + 'ui' => 1, + 'message' => __( "Add 'other' choice to allow for custom values", 'acf' ), + ) + ); + + // save_other_choice + acf_render_field_setting( + $field, + array( + 'label' => __( 'Save Other', 'acf' ), + 'instructions' => '', + 'name' => 'save_other_choice', + 'type' => 'true_false', + 'ui' => 1, + 'message' => __( "Save 'other' values to the field's choices", 'acf' ), + 'conditions' => array( + 'field' => 'other_choice', + 'operator' => '==', + 'value' => 1, + ), + ) + ); + + // default_value + acf_render_field_setting( + $field, + array( + 'label' => __( 'Default Value', 'acf' ), + 'instructions' => __( 'Appears when creating a new post', 'acf' ), + 'type' => 'text', + 'name' => 'default_value', + ) + ); + + // layout + acf_render_field_setting( + $field, + array( + 'label' => __( 'Layout', 'acf' ), + 'instructions' => '', + 'type' => 'radio', + 'name' => 'layout', + 'layout' => 'horizontal', + 'choices' => array( + 'vertical' => __( 'Vertical', 'acf' ), + 'horizontal' => __( 'Horizontal', 'acf' ), + ), + ) + ); + + // return_format + 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( + 'value' => __( 'Value', 'acf' ), + 'label' => __( 'Label', 'acf' ), + 'array' => __( 'Both (Array)', 'acf' ), + ), + ) + ); + } - - - // return - return $value; - - } - - - /* - * translate_field - * - * This function will translate field settings - * - * @type function - * @date 8/03/2016 - * @since 5.3.2 - * - * @param $field (array) - * @return $field - */ - - function translate_field( $field ) { - - return acf_get_field_type('select')->translate_field( $field ); - - } - - - /* - * format_value() - * - * This filter is appied to the $value after it is loaded from the db and before it is returned to the template - * - * @type filter - * @since 3.6 - * @date 23/01/13 - * - * @param $value (mixed) the value which was loaded from the database - * @param $post_id (mixed) the $post_id from which the value was loaded - * @param $field (array) the field array holding all the field options - * - * @return $value (mixed) the modified value - */ - - function format_value( $value, $post_id, $field ) { - - return acf_get_field_type('select')->format_value( $value, $post_id, $field ); - - } - -} -// initialize -acf_register_field_type( 'acf_field_radio' ); + /* + * update_field() + * + * This filter is appied to the $field before it is saved to the database + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $field - the field array holding all the field options + * @param $post_id - the field group ID (post_type = acf) + * + * @return $field - the modified field + */ + + function update_field( $field ) { + + // decode choices (convert to array) + $field['choices'] = acf_decode_choices( $field['choices'] ); + + // return + return $field; + } + + + /* + * update_value() + * + * This filter is appied to the $value before it is updated in the db + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * @todo Fix bug where $field was found via json and has no ID + * + * @param $value - the value which will be saved in the database + * @param $post_id - the $post_id of which the value will be saved + * @param $field - the field array holding all the field options + * + * @return $value - the modified value + */ + + function update_value( $value, $post_id, $field ) { + + // bail early if no value (allow 0 to be saved) + if ( ! $value && ! is_numeric( $value ) ) { + return $value; + } + + // save_other_choice + if ( $field['save_other_choice'] ) { + + // value isn't in choices yet + if ( ! isset( $field['choices'][ $value ] ) ) { + + // get raw $field (may have been changed via repeater field) + // if field is local, it won't have an ID + $selector = $field['ID'] ? $field['ID'] : $field['key']; + $field = acf_get_field( $selector, true ); + + // bail early if no ID (JSON only) + if ( ! $field['ID'] ) { + return $value; + } + + // unslash (fixes serialize single quote issue) + $value = wp_unslash( $value ); + + // sanitize (remove tags) + $value = sanitize_text_field( $value ); + + // update $field + $field['choices'][ $value ] = $value; + + // save + acf_update_field( $field ); + + } + } + + // return + return $value; + } + + + /* + * load_value() + * + * This filter is appied to the $value after it is loaded from the db + * + * @type filter + * @since 5.2.9 + * @date 23/01/13 + * + * @param $value - the value found in the database + * @param $post_id - the $post_id from which the value was loaded from + * @param $field - the field array holding all the field options + * + * @return $value - the value to be saved in te database + */ + + function load_value( $value, $post_id, $field ) { + + // must be single value + if ( is_array( $value ) ) { + + $value = array_pop( $value ); + + } + + // return + return $value; + + } + + + /* + * translate_field + * + * This function will translate field settings + * + * @type function + * @date 8/03/2016 + * @since 5.3.2 + * + * @param $field (array) + * @return $field + */ + + function translate_field( $field ) { + + return acf_get_field_type( 'select' )->translate_field( $field ); + + } + + + /* + * format_value() + * + * This filter is appied to the $value after it is loaded from the db and before it is returned to the template + * + * @type filter + * @since 3.6 + * @date 23/01/13 + * + * @param $value (mixed) the value which was loaded from the database + * @param $post_id (mixed) the $post_id from which the value was loaded + * @param $field (array) the field array holding all the field options + * + * @return $value (mixed) the modified value + */ + + function format_value( $value, $post_id, $field ) { + + return acf_get_field_type( 'select' )->format_value( $value, $post_id, $field ); + + } + + } + + + // initialize + acf_register_field_type( 'acf_field_radio' ); endif; // class_exists check -?> \ No newline at end of file + diff --git a/includes/fields/class-acf-field-range.php b/includes/fields/class-acf-field-range.php index 8970326..0deb2f4 100644 --- a/includes/fields/class-acf-field-range.php +++ b/includes/fields/class-acf-field-range.php @@ -1,220 +1,239 @@ name = 'range'; + $this->label = __( 'Range', 'acf' ); + $this->defaults = array( + 'default_value' => '', + 'min' => '', + 'max' => '', + 'step' => '', + 'prepend' => '', + 'append' => '', + ); -class acf_field_range extends acf_field_number { - - - /* - * initialize - * - * This function will setup the field type data - * - * @type function - * @date 5/03/2014 - * @since 5.0.0 - * - * @param n/a - * @return n/a - */ - - function initialize() { - - // vars - $this->name = 'range'; - $this->label = __("Range",'acf'); - $this->defaults = array( - 'default_value' => '', - 'min' => '', - 'max' => '', - 'step' => '', - 'prepend' => '', - 'append' => '' - ); - - } - - - /* - * render_field() - * - * Create the HTML interface for your field - * - * @param $field - an array holding all the field's data - * - * @type action - * @since 3.6 - * @date 23/01/13 - */ - - function render_field( $field ) { - - // vars - $atts = array(); - $keys = array( 'type', 'id', 'class', 'name', 'value', 'min', 'max', 'step' ); - $keys2 = array( 'readonly', 'disabled', 'required' ); - $html = ''; - - // step - if( !$field['step'] ) { - $field['step'] = 1; } - - // min / max - if( !$field['min'] ) { - $field['min'] = 0; - } - if( !$field['max'] ) { - $field['max'] = 100; - } - - // allow for prev 'non numeric' value - if( !is_numeric($field['value']) ) { - $field['value'] = 0; - } - - // constrain within max and min - $field['value'] = max($field['value'], $field['min']); - $field['value'] = min($field['value'], $field['max']); - - // atts (value="123") - foreach( $keys as $k ) { - if( isset($field[ $k ]) ) $atts[ $k ] = $field[ $k ]; - } - - // atts2 (disabled="disabled") - foreach( $keys2 as $k ) { - if( !empty($field[ $k ]) ) $atts[ $k ] = $k; - } - - // remove empty atts - $atts = acf_clean_atts( $atts ); - - // open - $html .= '
';
-
- // prepend
- if( $field['prepend'] !== '' ) {
- $html .= '
';
-
- // return
- echo $html;
- }
-
-
- /*
- * render_field_settings()
- *
- * Create extra options for your field. This is rendered when editing a field.
- * The value of $field['name'] can be used (like bellow) to save extra data to the $field
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- *
- * @param $field - an array holding all the field's data
- */
-
- 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'),
- 'type' => 'number',
- 'name' => 'default_value',
- ));
-
-
- // min
- acf_render_field_setting( $field, array(
- 'label' => __('Minimum Value','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'min',
- 'placeholder' => '0'
- ));
-
-
- // max
- acf_render_field_setting( $field, array(
- 'label' => __('Maximum Value','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'max',
- 'placeholder' => '100'
- ));
-
-
- // step
- acf_render_field_setting( $field, array(
- 'label' => __('Step Size','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'step',
- 'placeholder' => '1'
- ));
-
-
- // prepend
- 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'),
- 'type' => 'text',
- 'name' => 'append',
- ));
-
- }
-
-
-}
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Append', 'acf' ),
+ 'instructions' => __( 'Appears after the input', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'append',
+ )
+ );
+
+ }
-// initialize
-acf_register_field_type( 'acf_field_range' );
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_range' );
endif; // class_exists check
-?>
\ No newline at end of file
+
diff --git a/includes/fields/class-acf-field-relationship.php b/includes/fields/class-acf-field-relationship.php
index eb67e72..71dd2f8 100644
--- a/includes/fields/class-acf-field-relationship.php
+++ b/includes/fields/class-acf-field-relationship.php
@@ -1,499 +1,512 @@
name = 'relationship';
- $this->label = __("Relationship",'acf');
- $this->category = 'relational';
- $this->defaults = array(
- 'post_type' => array(),
- 'taxonomy' => array(),
- 'min' => 0,
- 'max' => 0,
- 'filters' => array('search', 'post_type', 'taxonomy'),
- 'elements' => array(),
- 'return_format' => 'object'
- );
-
- // extra
- add_action('wp_ajax_acf/fields/relationship/query', array($this, 'ajax_query'));
- add_action('wp_ajax_nopriv_acf/fields/relationship/query', array($this, 'ajax_query'));
-
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // localize
- acf_localize_text(array(
- //'Minimum values reached ( {min} values )' => __('Minimum values reached ( {min} values )', 'acf'),
- 'Maximum values reached ( {max} values )' => __('Maximum values reached ( {max} values )', 'acf'),
- 'Loading' => __('Loading', 'acf'),
- 'No matches found' => __('No matches found', 'acf'),
- ));
- }
-
-
- /*
- * ajax_query
- *
- * description
- *
- * @type function
- * @date 24/10/13
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function ajax_query() {
-
- // validate
- if( !acf_verify_ajax() ) die();
-
-
- // get choices
- $response = $this->get_ajax_query( $_POST );
-
-
- // return
- acf_send_ajax_results($response);
-
- }
-
-
- /*
- * get_ajax_query
- *
- * This function will return an array of data formatted for use in a select2 AJAX response
- *
- * @type function
- * @date 15/10/2014
- * @since 5.0.9
- *
- * @param $options (array)
- * @return (array)
- */
-
- function get_ajax_query( $options = array() ) {
-
- // defaults
- $options = wp_parse_args($options, array(
- 'post_id' => 0,
- 's' => '',
- 'field_key' => '',
- 'paged' => 1,
- 'post_type' => '',
- 'taxonomy' => ''
- ));
-
-
- // load field
- $field = acf_get_field( $options['field_key'] );
- if( !$field ) return false;
-
-
- // vars
- $results = array();
- $args = array();
- $s = false;
- $is_search = false;
-
-
- // paged
- $args['posts_per_page'] = 20;
- $args['paged'] = intval($options['paged']);
-
-
- // search
- if( $options['s'] !== '' ) {
-
- // strip slashes (search may be integer)
- $s = wp_unslash( strval($options['s']) );
-
-
- // update vars
- $args['s'] = $s;
- $is_search = true;
-
- }
-
-
- // post_type
- if( !empty($options['post_type']) ) {
-
- $args['post_type'] = acf_get_array( $options['post_type'] );
-
- } elseif( !empty($field['post_type']) ) {
-
- $args['post_type'] = acf_get_array( $field['post_type'] );
-
- } else {
-
- $args['post_type'] = acf_get_post_types();
-
- }
-
-
- // taxonomy
- if( !empty($options['taxonomy']) ) {
-
// vars
- $term = acf_decode_taxonomy_term($options['taxonomy']);
-
-
- // tax query
- $args['tax_query'] = array();
-
-
- // append
- $args['tax_query'][] = array(
- 'taxonomy' => $term['taxonomy'],
- 'field' => 'slug',
- 'terms' => $term['term'],
+ $this->name = 'relationship';
+ $this->label = __( 'Relationship', 'acf' );
+ $this->category = 'relational';
+ $this->defaults = array(
+ 'post_type' => array(),
+ 'taxonomy' => array(),
+ 'min' => 0,
+ 'max' => 0,
+ 'filters' => array( 'search', 'post_type', 'taxonomy' ),
+ 'elements' => array(),
+ 'return_format' => 'object',
);
-
-
- } elseif( !empty($field['taxonomy']) ) {
-
+
+ // extra
+ add_action( 'wp_ajax_acf/fields/relationship/query', array( $this, 'ajax_query' ) );
+ add_action( 'wp_ajax_nopriv_acf/fields/relationship/query', array( $this, 'ajax_query' ) );
+
+ }
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // localize
+ acf_localize_text(
+ array(
+ // 'Minimum values reached ( {min} values )' => __('Minimum values reached ( {min} values )', 'acf'),
+ 'Maximum values reached ( {max} values )' => __( 'Maximum values reached ( {max} values )', 'acf' ),
+ 'Loading' => __( 'Loading', 'acf' ),
+ 'No matches found' => __( 'No matches found', 'acf' ),
+ )
+ );
+ }
+
+
+ /*
+ * ajax_query
+ *
+ * description
+ *
+ * @type function
+ * @date 24/10/13
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function ajax_query() {
+
+ // validate
+ if ( ! acf_verify_ajax() ) {
+ die();
+ }
+
+ // get choices
+ $response = $this->get_ajax_query( $_POST );
+
+ // return
+ acf_send_ajax_results( $response );
+
+ }
+
+
+ /*
+ * get_ajax_query
+ *
+ * This function will return an array of data formatted for use in a select2 AJAX response
+ *
+ * @type function
+ * @date 15/10/2014
+ * @since 5.0.9
+ *
+ * @param $options (array)
+ * @return (array)
+ */
+
+ function get_ajax_query( $options = array() ) {
+
+ // defaults
+ $options = wp_parse_args(
+ $options,
+ array(
+ 'post_id' => 0,
+ 's' => '',
+ 'field_key' => '',
+ 'paged' => 1,
+ 'post_type' => '',
+ 'taxonomy' => '',
+ )
+ );
+
+ // load field
+ $field = acf_get_field( $options['field_key'] );
+ if ( ! $field ) {
+ return false;
+ }
+
// vars
- $terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
-
-
- // append to $args
- $args['tax_query'] = array(
- 'relation' => 'OR',
- );
-
-
- // now create the tax queries
- foreach( $terms as $k => $v ) {
-
- $args['tax_query'][] = array(
- 'taxonomy' => $k,
- 'field' => 'slug',
- 'terms' => $v,
- );
-
+ $results = array();
+ $args = array();
+ $s = false;
+ $is_search = false;
+
+ // paged
+ $args['posts_per_page'] = 20;
+ $args['paged'] = intval( $options['paged'] );
+
+ // search
+ if ( $options['s'] !== '' ) {
+
+ // strip slashes (search may be integer)
+ $s = wp_unslash( strval( $options['s'] ) );
+
+ // update vars
+ $args['s'] = $s;
+ $is_search = true;
+
}
-
- }
-
-
- // filters
- $args = apply_filters('acf/fields/relationship/query', $args, $field, $options['post_id']);
- $args = apply_filters('acf/fields/relationship/query/name=' . $field['name'], $args, $field, $options['post_id'] );
- $args = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-
-
- // get posts grouped by post type
- $groups = acf_get_grouped_posts( $args );
-
-
- // bail early if no posts
- if( empty($groups) ) return false;
-
-
- // loop
- foreach( array_keys($groups) as $group_title ) {
-
- // vars
- $posts = acf_extract_var( $groups, $group_title );
-
-
- // data
- $data = array(
- 'text' => $group_title,
- 'children' => array()
- );
-
-
- // convert post objects to post titles
- foreach( array_keys($posts) as $post_id ) {
-
- $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
-
- }
-
-
- // order posts by search
- if( $is_search && empty($args['orderby']) && isset($args['s']) ) {
-
- $posts = acf_order_by_search( $posts, $args['s'] );
-
- }
-
-
- // append to $data
- foreach( array_keys($posts) as $post_id ) {
-
- $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
-
- }
-
-
- // append to $results
- $results[] = $data;
-
- }
-
-
- // add as optgroup or results
- if( count($args['post_type']) == 1 ) {
-
- $results = $results[0]['children'];
-
- }
-
-
- // vars
- $response = array(
- 'results' => $results,
- 'limit' => $args['posts_per_page']
- );
-
-
- // return
- return $response;
-
- }
-
-
- /*
- * get_post_result
- *
- * This function will return an array containing id, text and maybe description data
- *
- * @type function
- * @date 7/07/2016
- * @since 5.4.0
- *
- * @param $id (mixed)
- * @param $text (string)
- * @return (array)
- */
-
- function get_post_result( $id, $text ) {
-
- // vars
- $result = array(
- 'id' => $id,
- 'text' => $text
- );
-
-
- // return
- return $result;
-
- }
-
-
- /*
- * get_post_title
- *
- * This function returns the HTML for a result
- *
- * @type function
- * @date 1/11/2013
- * @since 5.0.0
- *
- * @param $post (object)
- * @param $field (array)
- * @param $post_id (int) the post_id to which this value is saved to
- * @return (string)
- */
-
- function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
-
- // get post_id
- if( !$post_id ) $post_id = acf_get_form_data('post_id');
-
-
- // vars
- $title = acf_get_post_title( $post, $is_search );
-
-
- // featured_image
- if( acf_in_array('featured_image', $field['elements']) ) {
-
- // vars
- $class = 'thumbnail';
- $thumbnail = acf_get_post_thumbnail($post->ID, array(17, 17));
-
-
- // icon
- if( $thumbnail['type'] == 'icon' ) {
-
- $class .= ' -' . $thumbnail['type'];
-
- }
-
-
- // append
- $title = '' . acf_esc_html($field['prepend']) . '
';
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $atts = array();
+ $keys = array( 'type', 'id', 'class', 'name', 'value', 'min', 'max', 'step' );
+ $keys2 = array( 'readonly', 'disabled', 'required' );
+ $html = '';
+
+ // step
+ if ( ! $field['step'] ) {
+ $field['step'] = 1;
}
-
+
+ // min / max
+ if ( ! $field['min'] ) {
+ $field['min'] = 0;
+ }
+ if ( ! $field['max'] ) {
+ $field['max'] = 100;
+ }
+
+ // allow for prev 'non numeric' value
+ if ( ! is_numeric( $field['value'] ) ) {
+ $field['value'] = 0;
+ }
+
+ // constrain within max and min
+ $field['value'] = max( $field['value'], $field['min'] );
+ $field['value'] = min( $field['value'], $field['max'] );
+
+ // atts (value="123")
+ foreach ( $keys as $k ) {
+ if ( isset( $field[ $k ] ) ) {
+ $atts[ $k ] = $field[ $k ];
+ }
+ }
+
+ // atts2 (disabled="disabled")
+ foreach ( $keys2 as $k ) {
+ if ( ! empty( $field[ $k ] ) ) {
+ $atts[ $k ] = $k;
+ }
+ }
+
+ // remove empty atts
+ $atts = acf_clean_atts( $atts );
+
+ // open
+ $html .= '';
+
+ // prepend
+ if ( $field['prepend'] !== '' ) {
+ $html .= '
';
+
+ // return
+ echo $html;
+ }
+
+
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ 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' ),
+ 'type' => 'number',
+ 'name' => 'default_value',
+ )
+ );
+
+ // min
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Minimum Value', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'min',
+ 'placeholder' => '0',
+ )
+ );
+
+ // max
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Maximum Value', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'max',
+ 'placeholder' => '100',
+ )
+ );
+
+ // step
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Step Size', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'step',
+ 'placeholder' => '1',
+ )
+ );
+
+ // prepend
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Prepend', 'acf' ),
+ 'instructions' => __( 'Appears before the input', 'acf' ),
+ 'type' => 'text',
+ 'name' => 'prepend',
+ )
+ );
+
// append
- if( $field['append'] !== '' ) {
- $html .= '' . acf_esc_html( $field['prepend'] ) . '
';
+ }
+
// range
$html .= acf_get_text_input( $atts );
// Calculate input width based on the largest possible input character length.
// Also take into account the step size for decimal steps minus - 1.5 chars for leading "0.".
$len = max(
- strlen( strval($field['min']) ),
- strlen( strval($field['max']) )
+ strlen( strval( $field['min'] ) ),
+ strlen( strval( $field['max'] ) )
);
- if( floatval($atts['step']) < 1 ) {
- $len += strlen( strval($field['step']) ) - 1.5;
+ if ( floatval( $atts['step'] ) < 1 ) {
+ $len += strlen( strval( $field['step'] ) ) - 1.5;
}
-
- // input
- $html .= acf_get_text_input(array(
- 'type' => 'number',
- 'id' => $atts['id'] . '-alt',
- 'value' => $atts['value'],
- 'step' => $atts['step'],
- //'min' => $atts['min'], // removed to avoid browser validation errors
- //'max' => $atts['max'],
- 'style' => 'width: ' . (1.8 + $len*0.7) . 'em;'
- ));
-
+
+ // input
+ $html .= acf_get_text_input(
+ array(
+ 'type' => 'number',
+ 'id' => $atts['id'] . '-alt',
+ 'value' => $atts['value'],
+ 'step' => $atts['step'],
+ // 'min' => $atts['min'], // removed to avoid browser validation errors
+ // 'max' => $atts['max'],
+ 'style' => 'width: ' . ( 1.8 + $len * 0.7 ) . 'em;',
+ )
+ );
+
+ // append
+ if ( $field['append'] !== '' ) {
+ $html .= '' . acf_esc_html( $field['append'] ) . '
';
+ }
+
+ // close
+ $html .= '' . acf_esc_html($field['append']) . '
';
- }
-
- // close
- $html .= '' . $thumbnail['html'] . '
' . $title;
-
- }
-
-
- // filters
- $title = apply_filters('acf/fields/relationship/result', $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/relationship/result/name=' . $field['_name'], $title, $post, $field, $post_id);
- $title = apply_filters('acf/fields/relationship/result/key=' . $field['key'], $title, $post, $field, $post_id);
-
-
- // return
- return $title;
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // vars
- $post_type = acf_get_array( $field['post_type'] );
- $taxonomy = acf_get_array( $field['taxonomy'] );
- $filters = acf_get_array( $field['filters'] );
-
- // filters
- $filter_count = count($filters);
- $filter_post_type_choices = array();
- $filter_taxonomy_choices = array();
-
- // post_type filter
- if( in_array('post_type', $filters) ) {
-
- $filter_post_type_choices = array(
- '' => __('Select post type', 'acf')
- ) + acf_get_pretty_post_types( $post_type );
- }
-
- // taxonomy filter
- if( in_array('taxonomy', $filters) ) {
-
- $term_choices = array();
- $filter_taxonomy_choices = array(
- '' => __('Select taxonomy', 'acf')
- );
-
- // check for specific taxonomy setting
- if( $taxonomy ) {
- $terms = acf_get_encoded_terms( $taxonomy );
- $term_choices = acf_get_choices_from_terms( $terms, 'slug' );
-
- // if no terms were specified, find all terms
+
+ // post_type
+ if ( ! empty( $options['post_type'] ) ) {
+
+ $args['post_type'] = acf_get_array( $options['post_type'] );
+
+ } elseif ( ! empty( $field['post_type'] ) ) {
+
+ $args['post_type'] = acf_get_array( $field['post_type'] );
+
} else {
-
- // restrict taxonomies by the post_type selected
- $term_args = array();
- if( $post_type ) {
- $term_args['taxonomy'] = acf_get_taxonomies(array(
- 'post_type' => $post_type
- ));
- }
-
- // get terms
- $terms = acf_get_grouped_terms( $term_args );
- $term_choices = acf_get_choices_from_grouped_terms( $terms, 'slug' );
+
+ $args['post_type'] = acf_get_post_types();
+
}
-
- // append term choices
- $filter_taxonomy_choices = $filter_taxonomy_choices + $term_choices;
-
+
+ // taxonomy
+ if ( ! empty( $options['taxonomy'] ) ) {
+
+ // vars
+ $term = acf_decode_taxonomy_term( $options['taxonomy'] );
+
+ // tax query
+ $args['tax_query'] = array();
+
+ // append
+ $args['tax_query'][] = array(
+ 'taxonomy' => $term['taxonomy'],
+ 'field' => 'slug',
+ 'terms' => $term['term'],
+ );
+
+ } elseif ( ! empty( $field['taxonomy'] ) ) {
+
+ // vars
+ $terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
+
+ // append to $args
+ $args['tax_query'] = array(
+ 'relation' => 'OR',
+ );
+
+ // now create the tax queries
+ foreach ( $terms as $k => $v ) {
+
+ $args['tax_query'][] = array(
+ 'taxonomy' => $k,
+ 'field' => 'slug',
+ 'terms' => $v,
+ );
+
+ }
+ }
+
+ // filters
+ $args = apply_filters( 'acf/fields/relationship/query', $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/relationship/query/name=' . $field['name'], $args, $field, $options['post_id'] );
+ $args = apply_filters( 'acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+
+ // get posts grouped by post type
+ $groups = acf_get_grouped_posts( $args );
+
+ // bail early if no posts
+ if ( empty( $groups ) ) {
+ return false;
+ }
+
+ // loop
+ foreach ( array_keys( $groups ) as $group_title ) {
+
+ // vars
+ $posts = acf_extract_var( $groups, $group_title );
+
+ // data
+ $data = array(
+ 'text' => $group_title,
+ 'children' => array(),
+ );
+
+ // convert post objects to post titles
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+
+ }
+
+ // order posts by search
+ if ( $is_search && empty( $args['orderby'] ) && isset( $args['s'] ) ) {
+
+ $posts = acf_order_by_search( $posts, $args['s'] );
+
+ }
+
+ // append to $data
+ foreach ( array_keys( $posts ) as $post_id ) {
+
+ $data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ] );
+
+ }
+
+ // append to $results
+ $results[] = $data;
+
+ }
+
+ // add as optgroup or results
+ if ( count( $args['post_type'] ) == 1 ) {
+
+ $results = $results[0]['children'];
+
+ }
+
+ // vars
+ $response = array(
+ 'results' => $results,
+ 'limit' => $args['posts_per_page'],
+ );
+
+ // return
+ return $response;
+
}
-
- // div attributes
- $atts = array(
- 'id' => $field['id'],
- 'class' => "acf-relationship {$field['class']}",
- 'data-min' => $field['min'],
- 'data-max' => $field['max'],
- 'data-s' => '',
- 'data-paged' => 1,
- 'data-post_type' => '',
- 'data-taxonomy' => '',
- );
-
- ?>
->
+
+
+ /*
+ * get_post_result
+ *
+ * This function will return an array containing id, text and maybe description data
+ *
+ * @type function
+ * @date 7/07/2016
+ * @since 5.4.0
+ *
+ * @param $id (mixed)
+ * @param $text (string)
+ * @return (array)
+ */
+
+ function get_post_result( $id, $text ) {
+
+ // vars
+ $result = array(
+ 'id' => $id,
+ 'text' => $text,
+ );
+
+ // return
+ return $result;
+
+ }
+
+
+ /*
+ * get_post_title
+ *
+ * This function returns the HTML for a result
+ *
+ * @type function
+ * @date 1/11/2013
+ * @since 5.0.0
+ *
+ * @param $post (object)
+ * @param $field (array)
+ * @param $post_id (int) the post_id to which this value is saved to
+ * @return (string)
+ */
+
+ function get_post_title( $post, $field, $post_id = 0, $is_search = 0 ) {
+
+ // get post_id
+ if ( ! $post_id ) {
+ $post_id = acf_get_form_data( 'post_id' );
+ }
+
+ // vars
+ $title = acf_get_post_title( $post, $is_search );
+
+ // featured_image
+ if ( acf_in_array( 'featured_image', $field['elements'] ) ) {
+
+ // vars
+ $class = 'thumbnail';
+ $thumbnail = acf_get_post_thumbnail( $post->ID, array( 17, 17 ) );
+
+ // icon
+ if ( $thumbnail['type'] == 'icon' ) {
+
+ $class .= ' -' . $thumbnail['type'];
+
+ }
+
+ // append
+ $title = '
' . $thumbnail['html'] . '
' . $title;
+
+ }
+
+ // filters
+ $title = apply_filters( 'acf/fields/relationship/result', $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/relationship/result/name=' . $field['_name'], $title, $post, $field, $post_id );
+ $title = apply_filters( 'acf/fields/relationship/result/key=' . $field['key'], $title, $post, $field, $post_id );
+
+ // return
+ return $title;
+
+ }
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // vars
+ $post_type = acf_get_array( $field['post_type'] );
+ $taxonomy = acf_get_array( $field['taxonomy'] );
+ $filters = acf_get_array( $field['filters'] );
+
+ // filters
+ $filter_count = count( $filters );
+ $filter_post_type_choices = array();
+ $filter_taxonomy_choices = array();
+
+ // post_type filter
+ if ( in_array( 'post_type', $filters ) ) {
+
+ $filter_post_type_choices = array(
+ '' => __( 'Select post type', 'acf' ),
+ ) + acf_get_pretty_post_types( $post_type );
+ }
+
+ // taxonomy filter
+ if ( in_array( 'taxonomy', $filters ) ) {
+
+ $term_choices = array();
+ $filter_taxonomy_choices = array(
+ '' => __( 'Select taxonomy', 'acf' ),
+ );
+
+ // check for specific taxonomy setting
+ if ( $taxonomy ) {
+ $terms = acf_get_encoded_terms( $taxonomy );
+ $term_choices = acf_get_choices_from_terms( $terms, 'slug' );
+
+ // if no terms were specified, find all terms
+ } else {
+
+ // restrict taxonomies by the post_type selected
+ $term_args = array();
+ if ( $post_type ) {
+ $term_args['taxonomy'] = acf_get_taxonomies(
+ array(
+ 'post_type' => $post_type,
+ )
+ );
+ }
+
+ // get terms
+ $terms = acf_get_grouped_terms( $term_args );
+ $term_choices = acf_get_choices_from_grouped_terms( $terms, 'slug' );
+ }
+
+ // append term choices
+ $filter_taxonomy_choices = $filter_taxonomy_choices + $term_choices;
+
+ }
+
+ // div attributes
+ $atts = array(
+ 'id' => $field['id'],
+ 'class' => "acf-relationship {$field['class']}",
+ 'data-min' => $field['min'],
+ 'data-max' => $field['max'],
+ 'data-s' => '',
+ 'data-paged' => 1,
+ 'data-post_type' => '',
+ 'data-taxonomy' => '',
+ );
+
+ ?>
+>
- $field['name'], 'value' => '') ); ?>
+ $field['name'],
+ 'value' => '',
+ )
+ );
+ ?>
-
-
-
+
+
- __('Filter by Post Type','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'post_type',
- 'choices' => acf_get_pretty_post_types(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All post types",'acf'),
- ));
-
-
- // taxonomy
- acf_render_field_setting( $field, array(
- 'label' => __('Filter by Taxonomy','acf'),
- 'instructions' => '',
- 'type' => 'select',
- 'name' => 'taxonomy',
- 'choices' => acf_get_taxonomy_terms(),
- 'multiple' => 1,
- 'ui' => 1,
- 'allow_null' => 1,
- 'placeholder' => __("All taxonomies",'acf'),
- ));
-
-
- // filters
- acf_render_field_setting( $field, array(
- 'label' => __('Filters','acf'),
- 'instructions' => '',
- 'type' => 'checkbox',
- 'name' => 'filters',
- 'choices' => array(
- 'search' => __("Search",'acf'),
- 'post_type' => __("Post Type",'acf'),
- 'taxonomy' => __("Taxonomy",'acf'),
- ),
- ));
-
-
- // filters
- acf_render_field_setting( $field, array(
- 'label' => __('Elements','acf'),
- 'instructions' => __('Selected elements will be displayed in each result','acf'),
- 'type' => 'checkbox',
- 'name' => 'elements',
- 'choices' => array(
- 'featured_image' => __("Featured Image",'acf'),
- ),
- ));
-
-
- // min
- acf_render_field_setting( $field, array(
- 'label' => __('Minimum posts','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'min',
- ));
-
-
- // max
- acf_render_field_setting( $field, array(
- 'label' => __('Maximum posts','acf'),
- 'instructions' => '',
- 'type' => 'number',
- 'name' => 'max',
- ));
-
-
-
-
- // return_format
- acf_render_field_setting( $field, array(
- 'label' => __('Return Format','acf'),
- 'instructions' => '',
- 'type' => 'radio',
- 'name' => 'return_format',
- 'choices' => array(
- 'object' => __("Post Object",'acf'),
- 'id' => __("Post ID",'acf'),
- ),
- 'layout' => 'horizontal',
- ));
-
-
- }
-
-
- /*
- * format_value()
- *
- * This filter is applied to the $value after it is loaded from the db and before it is returned to the template
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value (mixed) the value which was loaded from the database
- * @param $post_id (mixed) the $post_id from which the value was loaded
- * @param $field (array) the field array holding all the field options
- *
- * @return $value (mixed) the modified value
- */
-
- function format_value( $value, $post_id, $field ) {
-
- // bail early if no value
- if( empty($value) ) {
-
- return $value;
-
+ $value,
- 'post_type' => $field['post_type']
- ));
-
- }
-
-
- // return
- return $value;
-
- }
-
-
- /*
- * validate_value
- *
- * description
- *
- * @type function
- * @date 11/02/2014
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function validate_value( $valid, $value, $field, $input ){
-
- // default
- if( empty($value) || !is_array($value) ) {
-
- $value = array();
-
- }
-
-
- // min
- if( count($value) < $field['min'] ) {
-
- $valid = _n( '%s requires at least %s selection', '%s requires at least %s selections', $field['min'], 'acf' );
- $valid = sprintf( $valid, $field['label'], $field['min'] );
-
- }
-
-
- // return
- return $valid;
-
- }
-
-
- /*
- * update_value()
- *
- * This filter is applied to the $value before it is updated in the db
- *
- * @type filter
- * @since 3.6
- * @date 23/01/13
- *
- * @param $value - the value which will be saved in the database
- * @param $post_id - the $post_id of which the value will be saved
- * @param $field - the field array holding all the field options
- *
- * @return $value - the modified value
- */
-
- function update_value( $value, $post_id, $field ) {
-
- // Bail early if no value.
- if( empty($value) ) {
- return $value;
- }
-
- // Format array of values.
- // - ensure each value is an id.
- // - Parse each id as string for SQL LIKE queries.
- if( acf_is_sequential_array($value) ) {
- $value = array_map('acf_idval', $value);
- $value = array_map('strval', $value);
-
- // Parse single value for id.
- } else {
- $value = acf_idval( $value );
- }
-
- // Return value.
- return $value;
- }
-
-}
-// initialize
-acf_register_field_type( 'acf_field_relationship' );
+ /*
+ * render_field_settings()
+ *
+ * Create extra options for your field. This is rendered when editing a field.
+ * The value of $field['name'] can be used (like bellow) to save extra data to the $field
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $field - an array holding all the field's data
+ */
+
+ function render_field_settings( $field ) {
+
+ // vars
+ $field['min'] = empty( $field['min'] ) ? '' : $field['min'];
+ $field['max'] = empty( $field['max'] ) ? '' : $field['max'];
+
+ // post_type
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Post Type', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'post_type',
+ 'choices' => acf_get_pretty_post_types(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All post types', 'acf' ),
+ )
+ );
+
+ // taxonomy
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filter by Taxonomy', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'select',
+ 'name' => 'taxonomy',
+ 'choices' => acf_get_taxonomy_terms(),
+ 'multiple' => 1,
+ 'ui' => 1,
+ 'allow_null' => 1,
+ 'placeholder' => __( 'All taxonomies', 'acf' ),
+ )
+ );
+
+ // filters
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Filters', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'checkbox',
+ 'name' => 'filters',
+ 'choices' => array(
+ 'search' => __( 'Search', 'acf' ),
+ 'post_type' => __( 'Post Type', 'acf' ),
+ 'taxonomy' => __( 'Taxonomy', 'acf' ),
+ ),
+ )
+ );
+
+ // filters
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Elements', 'acf' ),
+ 'instructions' => __( 'Selected elements will be displayed in each result', 'acf' ),
+ 'type' => 'checkbox',
+ 'name' => 'elements',
+ 'choices' => array(
+ 'featured_image' => __( 'Featured Image', 'acf' ),
+ ),
+ )
+ );
+
+ // min
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Minimum posts', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'min',
+ )
+ );
+
+ // max
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Maximum posts', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'number',
+ 'name' => 'max',
+ )
+ );
+
+ // return_format
+ acf_render_field_setting(
+ $field,
+ array(
+ 'label' => __( 'Return Format', 'acf' ),
+ 'instructions' => '',
+ 'type' => 'radio',
+ 'name' => 'return_format',
+ 'choices' => array(
+ 'object' => __( 'Post Object', 'acf' ),
+ 'id' => __( 'Post ID', 'acf' ),
+ ),
+ 'layout' => 'horizontal',
+ )
+ );
+
+ }
+
+
+ /*
+ * format_value()
+ *
+ * This filter is applied to the $value after it is loaded from the db and before it is returned to the template
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value (mixed) the value which was loaded from the database
+ * @param $post_id (mixed) the $post_id from which the value was loaded
+ * @param $field (array) the field array holding all the field options
+ *
+ * @return $value (mixed) the modified value
+ */
+
+ function format_value( $value, $post_id, $field ) {
+
+ // bail early if no value
+ if ( empty( $value ) ) {
+
+ return $value;
+
+ }
+
+ // force value to array
+ $value = acf_get_array( $value );
+
+ // convert to int
+ $value = array_map( 'intval', $value );
+
+ // load posts if needed
+ if ( $field['return_format'] == 'object' ) {
+
+ // get posts
+ $value = acf_get_posts(
+ array(
+ 'post__in' => $value,
+ 'post_type' => $field['post_type'],
+ )
+ );
+
+ }
+
+ // return
+ return $value;
+
+ }
+
+
+ /*
+ * validate_value
+ *
+ * description
+ *
+ * @type function
+ * @date 11/02/2014
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function validate_value( $valid, $value, $field, $input ) {
+
+ // default
+ if ( empty( $value ) || ! is_array( $value ) ) {
+
+ $value = array();
+
+ }
+
+ // min
+ if ( count( $value ) < $field['min'] ) {
+
+ $valid = _n( '%1$s requires at least %2$s selection', '%1$s requires at least %2$s selections', $field['min'], 'acf' );
+ $valid = sprintf( $valid, $field['label'], $field['min'] );
+
+ }
+
+ // return
+ return $valid;
+
+ }
+
+
+ /*
+ * update_value()
+ *
+ * This filter is applied to the $value before it is updated in the db
+ *
+ * @type filter
+ * @since 3.6
+ * @date 23/01/13
+ *
+ * @param $value - the value which will be saved in the database
+ * @param $post_id - the $post_id of which the value will be saved
+ * @param $field - the field array holding all the field options
+ *
+ * @return $value - the modified value
+ */
+
+ function update_value( $value, $post_id, $field ) {
+
+ // Bail early if no value.
+ if ( empty( $value ) ) {
+ return $value;
+ }
+
+ // Format array of values.
+ // - ensure each value is an id.
+ // - Parse each id as string for SQL LIKE queries.
+ if ( acf_is_sequential_array( $value ) ) {
+ $value = array_map( 'acf_idval', $value );
+ $value = array_map( 'strval', $value );
+
+ // Parse single value for id.
+ } else {
+ $value = acf_idval( $value );
+ }
+
+ // Return value.
+ return $value;
+ }
+
+ }
+
+
+ // initialize
+ acf_register_field_type( 'acf_field_relationship' );
endif; // class_exists check
diff --git a/includes/fields/class-acf-field-select.php b/includes/fields/class-acf-field-select.php
index 99f207c..2ceb14f 100644
--- a/includes/fields/class-acf-field-select.php
+++ b/includes/fields/class-acf-field-select.php
@@ -1,631 +1,638 @@
name = 'select';
- $this->label = _x('Select', 'noun', 'acf');
- $this->category = 'choice';
- $this->defaults = array(
- 'multiple' => 0,
- 'allow_null' => 0,
- 'choices' => array(),
- 'default_value' => '',
- 'ui' => 0,
- 'ajax' => 0,
- 'placeholder' => '',
- 'return_format' => 'value'
- );
-
-
- // ajax
- add_action('wp_ajax_acf/fields/select/query', array($this, 'ajax_query'));
- add_action('wp_ajax_nopriv_acf/fields/select/query', array($this, 'ajax_query'));
-
- }
-
-
- /*
- * input_admin_enqueue_scripts
- *
- * description
- *
- * @type function
- * @date 16/12/2015
- * @since 5.3.2
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function input_admin_enqueue_scripts() {
-
- // bail ealry if no enqueue
- if( !acf_get_setting('enqueue_select2') ) return;
-
-
- // globals
- global $wp_scripts, $wp_styles;
-
-
- // vars
- $min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
- $major = acf_get_setting('select2_version');
- $version = '';
- $script = '';
- $style = '';
-
-
- // attempt to find 3rd party Select2 version
- // - avoid including v3 CSS when v4 JS is already enququed
- if( isset($wp_scripts->registered['select2']) ) {
-
- $major = (int) $wp_scripts->registered['select2']->ver;
-
- }
-
-
- // v4
- if( $major == 4 ) {
-
- $version = '4.0';
- $script = acf_get_url("assets/inc/select2/4/select2.full{$min}.js");
- $style = acf_get_url("assets/inc/select2/4/select2{$min}.css");
-
- // v3
- } else {
-
- $version = '3.5.2';
- $script = acf_get_url("assets/inc/select2/3/select2{$min}.js");
- $style = acf_get_url("assets/inc/select2/3/select2.css");
-
- }
-
-
- // enqueue
- wp_enqueue_script('select2', $script, array('jquery'), $version );
- wp_enqueue_style('select2', $style, '', $version );
-
-
- // localize
- acf_localize_data(array(
- 'select2L10n' => array(
- 'matches_1' => _x('One result is available, press enter to select it.', 'Select2 JS matches_1', 'acf'),
- 'matches_n' => _x('%d results are available, use up and down arrow keys to navigate.', 'Select2 JS matches_n', 'acf'),
- 'matches_0' => _x('No matches found', 'Select2 JS matches_0', 'acf'),
- 'input_too_short_1' => _x('Please enter 1 or more characters', 'Select2 JS input_too_short_1', 'acf' ),
- 'input_too_short_n' => _x('Please enter %d or more characters', 'Select2 JS input_too_short_n', 'acf' ),
- 'input_too_long_1' => _x('Please delete 1 character', 'Select2 JS input_too_long_1', 'acf' ),
- 'input_too_long_n' => _x('Please delete %d characters', 'Select2 JS input_too_long_n', 'acf' ),
- 'selection_too_long_1' => _x('You can only select 1 item', 'Select2 JS selection_too_long_1', 'acf' ),
- 'selection_too_long_n' => _x('You can only select %d items', 'Select2 JS selection_too_long_n', 'acf' ),
- 'load_more' => _x('Loading more results…', 'Select2 JS load_more', 'acf' ),
- 'searching' => _x('Searching…', 'Select2 JS searching', 'acf' ),
- 'load_fail' => _x('Loading failed', 'Select2 JS load_fail', 'acf' ),
- )
- ));
- }
-
-
- /*
- * ajax_query
- *
- * description
- *
- * @type function
- * @date 24/10/13
- * @since 5.0.0
- *
- * @param $post_id (int)
- * @return $post_id (int)
- */
-
- function ajax_query() {
-
- // validate
- if( !acf_verify_ajax() ) die();
-
-
- // get choices
- $response = $this->get_ajax_query( $_POST );
-
-
- // return
- acf_send_ajax_results($response);
-
- }
-
-
- /*
- * get_ajax_query
- *
- * This function will return an array of data formatted for use in a select2 AJAX response
- *
- * @type function
- * @date 15/10/2014
- * @since 5.0.9
- *
- * @param $options (array)
- * @return (array)
- */
-
- function get_ajax_query( $options = array() ) {
-
- // defaults
- $options = acf_parse_args($options, array(
- 'post_id' => 0,
- 's' => '',
- 'field_key' => '',
- 'paged' => 1
- ));
-
-
- // load field
- $field = acf_get_field( $options['field_key'] );
- if( !$field ) return false;
-
-
- // get choices
- $choices = acf_get_array($field['choices']);
- if( empty($field['choices']) ) return false;
-
-
- // vars
- $results = array();
- $s = null;
-
-
- // search
- if( $options['s'] !== '' ) {
-
- // strip slashes (search may be integer)
- $s = strval( $options['s'] );
- $s = wp_unslash( $s );
-
- }
-
-
- // loop
- foreach( $field['choices'] as $k => $v ) {
-
- // ensure $v is a string
- $v = strval( $v );
-
-
- // if searching, but doesn't exist
- if( is_string($s) && stripos($v, $s) === false ) continue;
-
-
- // append
- $results[] = array(
- 'id' => $k,
- 'text' => $v
+ class acf_field_select extends acf_field {
+
+
+ /*
+ * __construct
+ *
+ * This function will setup the field type data
+ *
+ * @type function
+ * @date 5/03/2014
+ * @since 5.0.0
+ *
+ * @param n/a
+ * @return n/a
+ */
+
+ function initialize() {
+
+ // vars
+ $this->name = 'select';
+ $this->label = _x( 'Select', 'noun', 'acf' );
+ $this->category = 'choice';
+ $this->defaults = array(
+ 'multiple' => 0,
+ 'allow_null' => 0,
+ 'choices' => array(),
+ 'default_value' => '',
+ 'ui' => 0,
+ 'ajax' => 0,
+ 'placeholder' => '',
+ 'return_format' => 'value',
);
-
+
+ // ajax
+ add_action( 'wp_ajax_acf/fields/select/query', array( $this, 'ajax_query' ) );
+ add_action( 'wp_ajax_nopriv_acf/fields/select/query', array( $this, 'ajax_query' ) );
+
}
-
-
- // vars
- $response = array(
- 'results' => $results
- );
-
-
- // return
- return $response;
-
- }
-
-
- /*
- * render_field()
- *
- * Create the HTML interface for your field
- *
- * @param $field - an array holding all the field's data
- *
- * @type action
- * @since 3.6
- * @date 23/01/13
- */
-
- function render_field( $field ) {
-
- // convert
- $value = acf_get_array($field['value']);
- $choices = acf_get_array($field['choices']);
-
-
- // placeholder
- if( empty($field['placeholder']) ) {
- $field['placeholder'] = _x('Select', 'verb', 'acf');
+
+
+ /*
+ * input_admin_enqueue_scripts
+ *
+ * description
+ *
+ * @type function
+ * @date 16/12/2015
+ * @since 5.3.2
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function input_admin_enqueue_scripts() {
+
+ // bail ealry if no enqueue
+ if ( ! acf_get_setting( 'enqueue_select2' ) ) {
+ return;
+ }
+
+ // globals
+ global $wp_scripts, $wp_styles;
+
+ // vars
+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+ $major = acf_get_setting( 'select2_version' );
+ $version = '';
+ $script = '';
+ $style = '';
+
+ // attempt to find 3rd party Select2 version
+ // - avoid including v3 CSS when v4 JS is already enququed
+ if ( isset( $wp_scripts->registered['select2'] ) ) {
+
+ $major = (int) $wp_scripts->registered['select2']->ver;
+
+ }
+
+ // v4
+ if ( $major == 4 ) {
+
+ $version = '4.0';
+ $script = acf_get_url( "assets/inc/select2/4/select2.full{$min}.js" );
+ $style = acf_get_url( "assets/inc/select2/4/select2{$min}.css" );
+
+ // v3
+ } else {
+
+ $version = '3.5.2';
+ $script = acf_get_url( "assets/inc/select2/3/select2{$min}.js" );
+ $style = acf_get_url( 'assets/inc/select2/3/select2.css' );
+
+ }
+
+ // enqueue
+ wp_enqueue_script( 'select2', $script, array( 'jquery' ), $version );
+ wp_enqueue_style( 'select2', $style, '', $version );
+
+ // localize
+ acf_localize_data(
+ array(
+ 'select2L10n' => array(
+ 'matches_1' => _x( 'One result is available, press enter to select it.', 'Select2 JS matches_1', 'acf' ),
+ 'matches_n' => _x( '%d results are available, use up and down arrow keys to navigate.', 'Select2 JS matches_n', 'acf' ),
+ 'matches_0' => _x( 'No matches found', 'Select2 JS matches_0', 'acf' ),
+ 'input_too_short_1' => _x( 'Please enter 1 or more characters', 'Select2 JS input_too_short_1', 'acf' ),
+ 'input_too_short_n' => _x( 'Please enter %d or more characters', 'Select2 JS input_too_short_n', 'acf' ),
+ 'input_too_long_1' => _x( 'Please delete 1 character', 'Select2 JS input_too_long_1', 'acf' ),
+ 'input_too_long_n' => _x( 'Please delete %d characters', 'Select2 JS input_too_long_n', 'acf' ),
+ 'selection_too_long_1' => _x( 'You can only select 1 item', 'Select2 JS selection_too_long_1', 'acf' ),
+ 'selection_too_long_n' => _x( 'You can only select %d items', 'Select2 JS selection_too_long_n', 'acf' ),
+ 'load_more' => _x( 'Loading more results…', 'Select2 JS load_more', 'acf' ),
+ 'searching' => _x( 'Searching…', 'Select2 JS searching', 'acf' ),
+ 'load_fail' => _x( 'Loading failed', 'Select2 JS load_fail', 'acf' ),
+ ),
+ )
+ );
}
-
-
- // add empty value (allows '' to be selected)
- if( empty($value) ) {
- $value = array('');
+
+
+ /*
+ * ajax_query
+ *
+ * description
+ *
+ * @type function
+ * @date 24/10/13
+ * @since 5.0.0
+ *
+ * @param $post_id (int)
+ * @return $post_id (int)
+ */
+
+ function ajax_query() {
+
+ // validate
+ if ( ! acf_verify_ajax() ) {
+ die();
+ }
+
+ // get choices
+ $response = $this->get_ajax_query( $_POST );
+
+ // return
+ acf_send_ajax_results( $response );
+
}
-
-
- // prepend empty choice
- // - only for single selects
- // - have tried array_merge but this causes keys to re-index if is numeric (post ID's)
- if( $field['allow_null'] && !$field['multiple'] ) {
- $choices = array( '' => "- {$field['placeholder']} -" ) + $choices;
+
+
+ /*
+ * get_ajax_query
+ *
+ * This function will return an array of data formatted for use in a select2 AJAX response
+ *
+ * @type function
+ * @date 15/10/2014
+ * @since 5.0.9
+ *
+ * @param $options (array)
+ * @return (array)
+ */
+
+ function get_ajax_query( $options = array() ) {
+
+ // defaults
+ $options = acf_parse_args(
+ $options,
+ array(
+ 'post_id' => 0,
+ 's' => '',
+ 'field_key' => '',
+ 'paged' => 1,
+ )
+ );
+
+ // load field
+ $field = acf_get_field( $options['field_key'] );
+ if ( ! $field ) {
+ return false;
+ }
+
+ // get choices
+ $choices = acf_get_array( $field['choices'] );
+ if ( empty( $field['choices'] ) ) {
+ return false;
+ }
+
+ // vars
+ $results = array();
+ $s = null;
+
+ // search
+ if ( $options['s'] !== '' ) {
+
+ // strip slashes (search may be integer)
+ $s = strval( $options['s'] );
+ $s = wp_unslash( $s );
+
+ }
+
+ // loop
+ foreach ( $field['choices'] as $k => $v ) {
+
+ // ensure $v is a string
+ $v = strval( $v );
+
+ // if searching, but doesn't exist
+ if ( is_string( $s ) && stripos( $v, $s ) === false ) {
+ continue;
+ }
+
+ // append
+ $results[] = array(
+ 'id' => $k,
+ 'text' => $v,
+ );
+
+ }
+
+ // vars
+ $response = array(
+ 'results' => $results,
+ );
+
+ // return
+ return $response;
+
}
-
-
- // clean up choices if using ajax
- if( $field['ui'] && $field['ajax'] ) {
- $minimal = array();
- foreach( $value as $key ) {
- if( isset($choices[ $key ]) ) {
- $minimal[ $key ] = $choices[ $key ];
+
+
+ /*
+ * render_field()
+ *
+ * Create the HTML interface for your field
+ *
+ * @param $field - an array holding all the field's data
+ *
+ * @type action
+ * @since 3.6
+ * @date 23/01/13
+ */
+
+ function render_field( $field ) {
+
+ // convert
+ $value = acf_get_array( $field['value'] );
+ $choices = acf_get_array( $field['choices'] );
+
+ // placeholder
+ if ( empty( $field['placeholder'] ) ) {
+ $field['placeholder'] = _x( 'Select', 'verb', 'acf' );
+ }
+
+ // add empty value (allows '' to be selected)
+ if ( empty( $value ) ) {
+ $value = array( '' );
+ }
+
+ // prepend empty choice
+ // - only for single selects
+ // - have tried array_merge but this causes keys to re-index if is numeric (post ID's)
+ if ( $field['allow_null'] && ! $field['multiple'] ) {
+ $choices = array( '' => "- {$field['placeholder']} -" ) + $choices;
+ }
+
+ // clean up choices if using ajax
+ if ( $field['ui'] && $field['ajax'] ) {
+ $minimal = array();
+ foreach ( $value as $key ) {
+ if ( isset( $choices[ $key ] ) ) {
+ $minimal[ $key ] = $choices[ $key ];
+ }
+ }
+ $choices = $minimal;
+ }
+
+ // vars
+ $select = array(
+ 'id' => $field['id'],
+ 'class' => $field['class'],
+ 'name' => $field['name'],
+ 'data-ui' => $field['ui'],
+ 'data-ajax' => $field['ajax'],
+ 'data-multiple' => $field['multiple'],
+ 'data-placeholder' => $field['placeholder'],
+ 'data-allow_null' => $field['allow_null'],
+ );
+
+ // multiple
+ if ( $field['multiple'] ) {
+
+ $select['multiple'] = 'multiple';
+ $select['size'] = 5;
+ $select['name'] .= '[]';
+
+ // Reduce size to single line if UI.
+ if ( $field['ui'] ) {
+ $select['size'] = 1;
}
}
- $choices = $minimal;
- }
-
-
- // vars
- $select = array(
- 'id' => $field['id'],
- 'class' => $field['class'],
- 'name' => $field['name'],
- 'data-ui' => $field['ui'],
- 'data-ajax' => $field['ajax'],
- 'data-multiple' => $field['multiple'],
- 'data-placeholder' => $field['placeholder'],
- 'data-allow_null' => $field['allow_null']
- );
-
-
- // multiple
- if( $field['multiple'] ) {
-
- $select['multiple'] = 'multiple';
- $select['size'] = 5;
- $select['name'] .= '[]';
-
- // Reduce size to single line if UI.
- if( $field['ui'] ) {
- $select['size'] = 1;
+
+ // special atts
+ if ( ! empty( $field['readonly'] ) ) {
+ $select['readonly'] = 'readonly';
}
- }
-
-
- // special atts
- if( !empty($field['readonly']) ) $select['readonly'] = 'readonly';
- if( !empty($field['disabled']) ) $select['disabled'] = 'disabled';
- if( !empty($field['ajax_action']) ) $select['data-ajax_action'] = $field['ajax_action'];
-
-
- // hidden input is needed to allow validation to see
+
-
+
- __("Search...",'acf'), 'data-filter' => 's') ); ?>
+ __( 'Search...', 'acf' ),
+ 'data-filter' => 's',
+ )
+ );
+ ?>
-
+
- $filter_post_type_choices, 'data-filter' => 'post_type') ); ?>
+ $filter_post_type_choices,
+ 'data-filter' => 'post_type',
+ )
+ );
+ ?>
-
+
- $filter_taxonomy_choices, 'data-filter' => 'taxonomy') ); ?>
+ $filter_taxonomy_choices,
+ 'data-filter' => 'taxonomy',
+ )
+ );
+ ?>
-
+
@@ -501,279 +514,296 @@ class acf_field_relationship extends acf_field {
-
- $field['value'],
- 'post_type' => $field['post_type']
- ));
-
-
- // loop
- foreach( $posts as $post ): ?>
+ $field['value'],
+ 'post_type' => $field['post_type'],
+ )
+ );
+
+ // loop
+ foreach ( $posts as $post ) :
+ ?>