10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-16 05:03:33 +09:00
Code Issues Packages Projects Releases Wiki Activity

- removed extract() from um_admin_pre_save_fields_hook() function;

Browse Source 
- updated hookdoc for `um_admin_pre_save_fields_hook` hook;
- updated hookdoc for `um_fields_without_metakey` hook;
This commit is contained in:
Mykyta Synelnikov
2023-06-22 16:09:17 +03:00
parent 76d1e38e81
commit d5990c7bbb
2 changed files with 65 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-builder.php
+33 -39
View File
@@ -128,41 +128,40 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
/**
* Some fields may require extra fields before saving
* Some fields may require extra fields before saving.
*
* @param $array
* @param array $submission_data
*
* @return mixed
* @return array
*/
function um_admin_pre_save_fields_hook( $array ) {
/**
* @var $form_id
* @var $field_type
*/
extract( $array );
public function um_admin_pre_save_fields_hook( $submission_data ) {
if ( ! array_key_exists( 'form_id', $submission_data ) || ! array_key_exists( 'field_type', $submission_data ) || ! array_key_exists( 'post', $submission_data ) ) {
return $submission_data;
}
$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
$form_id = $submission_data['form_id'];
$field_type = $submission_data['field_type'];
$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
$count = 1;
$count = 1;
if ( ! empty( $fields ) ) {
$count = count( $fields ) + 1;
}
// set unique meta key
if ( in_array( $field_type, $fields_without_metakey ) && ! isset( $array['post']['_metakey'] ) ) {
$array['post']['_metakey'] = "um_{$field_type}_{$form_id}_{$count}";
// Set unique meta key.
$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
if ( ! array_key_exists( '_metakey', $submission_data['post'] ) && in_array( $field_type, $fields_without_metakey, true ) ) {
$submission_data['post']['_metakey'] = "um_{$field_type}_{$form_id}_{$count}";
}
// set position
if ( ! isset( $array['post']['_position'] ) ) {
$array['post']['_position'] = $count;
// Set position.
if ( ! array_key_exists( '_position', $submission_data['post'] ) ) {
$submission_data['post']['_position'] = $count;
}
return $array;
return $submission_data;
}
/**
* Modify field args just before it is saved into form
*
@@ -621,11 +620,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
/**
*
* AJAX handler for save the custom field in Form Builder.
*/
function update_field() {
public function update_field() {
UM()->admin()->check_ajax_nonce();
if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) {
@@ -642,24 +640,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
);
/**
* UM hook
* Filters the field data before save in Form Builder.
*
* @type filter
* @title um_admin_pre_save_fields_hook
* @description Filter field data before save
* @input_vars
* [{"var":"$array","type":"array","desc":"Save Field data"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_admin_pre_save_fields_hook', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_admin_pre_save_fields_hook', 'my_admin_pre_save_fields', 10, 1 );
* function my_admin_pre_save_fields( $array ) {
* // your code here
* return $array;
* @param {array} $submission_data Update field handler data. Already sanitized here.
*
* @return {array} Update field handler data.
*
* @since 1.3.x
* @hook um_admin_pre_save_fields_hook
*
* @example <caption>Change submitted value to new one by the field key.</caption>
* function my_custom_um_admin_pre_save_fields_hook( $submission_data ) {
* $submission_data['post']['{field_key}'] = {new value};
* return $submission_data;
* }
* ?>
* add_filter( 'um_admin_pre_save_fields_hook', 'my_custom_um_admin_pre_save_fields_hook' );
*/
$array = apply_filters( 'um_admin_pre_save_fields_hook', $array );
@@ -770,7 +765,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
UM()->fields()->globally_update_field( $field_ID, $field_args );
}
}
}
$output = json_encode( $output );
includes/core/class-builtin.php
+32 -37
View File
@@ -651,21 +651,21 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
),
/*'group' => array(
'name' => 'Field Group',
'col1' => array('_title','_max_entries'),
'col2' => array('_label','_public','_roles'),
'form_only' => true,
'validate' => array(
'_title' => array(
'mode' => 'required',
'error' => 'You must provide a title'
),
'_label' => array(
'mode' => 'required',
'error' => 'You must provide a label'
),
)
),*/
'name' => 'Field Group',
'col1' => array('_title','_max_entries'),
'col2' => array('_label','_public','_roles'),
'form_only' => true,
'validate' => array(
'_title' => array(
'mode' => 'required',
'error' => 'You must provide a title'
),
'_label' => array(
'mode' => 'required',
'error' => 'You must provide a label'
),
)
),*/
);
@@ -1379,48 +1379,43 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
}
}
/**
* Get all fields without metakeys
* Get all fields without metakeys.
*
* @since 2.0.56
*
* @return array
*/
function get_fields_without_metakey() {
public function get_fields_without_metakey() {
$fields_without_metakey = array(
'block',
'shortcode',
'spacing',
'divider',
'group'
'group',
);
/**
* UM hook
* Filters the field types without meta key.
*
* @type filter
* @title um_fields_without_metakey
* @description Field Types without meta key
* @input_vars
* [{"var":"$types","type":"array","desc":"Field Types"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_fields_without_metakey', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_fields_without_metakey', 'my_fields_without_metakey', 10, 1 );
* function my_fields_without_metakey( $types ) {
* // your code here
* return $types;
* @param {array} $field_types Field types.
*
* @return {array} Field types.
*
* @since 1.3.x
* @hook um_fields_without_metakey
*
* @example <caption>It adds 'location' and 'distance' field-types to fields without metakeys array.</caption>
* function my_custom_um_fields_without_metakey( $field_types ) {
* $field_types[] = 'location';
* $field_types[] = 'distance';
* return $field_types;
* }
* ?>
* add_filter( 'um_fields_without_metakey', 'my_custom_um_fields_without_metakey' );
*/
return apply_filters( 'um_fields_without_metakey', $fields_without_metakey );
}
/**
* May be used to show a dropdown, or source for user meta
*