Skip to content

Fixed migration issue #2727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Armanul46 merged 4 commits into from
Mar 1, 2026
Merged

Fixed migration issue #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c804d90
debug error log
Armanul46 Mar 1, 2026
ca2f1f2
work on migration
Armanul46 Mar 1, 2026
67fedd6
work on migration
Armanul46 Mar 1, 2026
59b9056
work on migration
Armanul46 Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions includes/classes/class-submission-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ protected static function is_admin_only_field( &$field ) {
// return ( $field->is_admin_only() && ! current_user_can( get_post_type_object( ATBDP_POST_TYPE )->cap->edit_others_posts ) );
}

// Removed: should_ignore_category_custom_field method (assign_to feature removed)
protected static function should_ignore_category_custom_field( &$field ) {
return ( $field->is_category_only() && ( is_null( self::$selected_categories ) || ! in_array( $field->get_assigned_category(), self::$selected_categories, true ) ) );
}

protected static function is_field_submission_empty( &$field, &$posted_data ) {
return $field->is_value_empty( $posted_data );
Expand All @@ -49,7 +51,9 @@ protected static function is_field_submission_empty( &$field, &$posted_data ) {
protected static function validate_field( &$field, &$posted_data ) {
$should_validate = (bool) apply_filters( 'atbdp_add_listing_form_validation_logic', true, $field->get_props(), $posted_data );

// Removed: should_ignore_category_custom_field check (assign_to feature removed)
if ( self::should_ignore_category_custom_field( $field ) ) {
$should_validate = false;
}

if ( ! $should_validate ) {
return array(
Expand Down Expand Up @@ -607,7 +611,9 @@ public static function submit( $posted_data, $from = 'web' ) {
continue;
}

// Removed: should_ignore_category_custom_field check (assign_to feature removed)
if ( self::should_ignore_category_custom_field( $field ) ) {
continue;
}

switch ( $field->get_internal_key() ) {
case 'title':
Expand Down
241 changes: 125 additions & 116 deletions includes/classes/class-upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,153 +81,114 @@ public function migrate_assign_to_conditional_logic() {
*/
private function migrate_directory_assign_to_fields( $directory_id ) {
$directory_id = absint( $directory_id );

if ( empty( $directory_id ) ) {
return;
}

// Optimization: Fetch both meta values in one go (reduces DB queries)
$submission_form_fields = get_term_meta( $directory_id, 'submission_form_fields', true );
$search_form_fields = get_term_meta( $directory_id, 'search_form_fields', true );
$search_form_fields = get_term_meta( $directory_id, 'search_form_fields', true );

// Security: Validate data structure
if ( ! is_array( $submission_form_fields ) ) {
$submission_form_fields = array();
}

if ( ! is_array( $search_form_fields ) ) {
$search_form_fields = array();
}

// Track migrated submission fields for syncing to search form
$migrated_fields = array();
$migrated_fields = array();
$submission_updated = false;
$search_updated = false;
$search_updated = false;

// Step 1: Migrate submission form fields (listing form)
// Step 1: Migrate submission form custom fields.
if ( ! empty( $submission_form_fields['fields'] ) && is_array( $submission_form_fields['fields'] ) ) {
foreach ( $submission_form_fields['fields'] as $field_key => $field ) {
if ( ! is_array( $field ) ) {
if ( ! is_array( $field ) || ! $this->is_custom_field_for_migration( $field ) ) {
continue;
}

// Only process custom fields
if ( ! $this->is_custom_field_for_migration( $field ) ) {
$existing_logic = $this->get_existing_conditional_logic( $field );
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue;
}

// Skip if field already has valid conditional_logic
if ( ! empty( $field['options']['conditional_logic']['value'] ) && is_array( $field['options']['conditional_logic']['value'] ) ) {
$existing_logic = $field['options']['conditional_logic']['value'];
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue;
}
}

// Security: Check for old assign_to field with proper validation
if ( empty( $field['assign_to'] ) || empty( $field['category'] ) ) {
continue;
}

// Security: Validate category ID is numeric
$category_id = is_numeric( $field['category'] ) ? absint( $field['category'] ) : null;
$category_id = is_numeric( $field['category'] ) ? absint( $field['category'] ) : 0;
if ( empty( $category_id ) ) {
continue;
}

// Convert category ID to conditional logic
$conditional_logic = $this->convert_assign_to_to_conditional_logic( $category_id, 'submission' );
if ( empty( $conditional_logic ) || ! is_array( $conditional_logic ) ) {
continue;
}

if ( ! empty( $conditional_logic ) && is_array( $conditional_logic ) ) {
// Ensure options array exists
if ( ! isset( $field['options'] ) || ! is_array( $field['options'] ) ) {
$field['options'] = array();
}

// Add conditional logic to options
$field['options']['conditional_logic'] = array(
'type' => 'conditional-logic',
'value' => $conditional_logic,
);

// Set at root level for listing form builder
$field['conditional_logic'] = $conditional_logic;

$submission_form_fields['fields'][ $field_key ] = $field;

// Store category ID for syncing to search form
$migrated_fields[ $field_key ] = $category_id;
$submission_updated = true;
// Cleanup broken old migration shape for option-list fields.
if ( ! empty( $field['options'] ) && is_array( $field['options'] ) && isset( $field['options'][0] ) && isset( $field['options']['conditional_logic'] ) ) {
unset( $field['options']['conditional_logic'] );
}

// Keep conditional logic at root level (safe for all field structures).
$field['conditional_logic'] = $conditional_logic;

$submission_form_fields['fields'][ $field_key ] = $field;
$migrated_fields[ $field_key ] = $category_id;
$submission_updated = true;
}

// Optimization: Save only if changes were made
if ( $submission_updated ) {
update_term_meta( $directory_id, 'submission_form_fields', $submission_form_fields );
}
}

// Step 2: Sync conditional logic to corresponding search form fields
// Step 2: Sync migrated submission custom fields to search custom fields.
if ( ! empty( $migrated_fields ) && ! empty( $search_form_fields['fields'] ) && is_array( $search_form_fields['fields'] ) ) {
foreach ( $search_form_fields['fields'] as $search_field_key => $search_field ) {
if ( ! is_array( $search_field ) ) {
if ( ! is_array( $search_field ) || ! $this->is_custom_field_for_migration( $search_field ) ) {
continue;
}

// Only process custom fields
if ( ! $this->is_custom_field_for_migration( $search_field ) ) {
$existing_logic = $this->get_existing_conditional_logic( $search_field );
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue;
}

// Skip if field already has valid conditional_logic
if ( ! empty( $search_field['options']['conditional_logic']['value'] ) && is_array( $search_field['options']['conditional_logic']['value'] ) ) {
$existing_logic = $search_field['options']['conditional_logic']['value'];
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue;
}
$form_key = ( isset( $search_field['original_widget_key'] ) && is_string( $search_field['original_widget_key'] ) ) ? $search_field['original_widget_key'] : '';
if ( '' === $form_key || ! isset( $migrated_fields[ $form_key ] ) ) {
continue;
}

// Security: Validate original_widget_key exists (don't sanitize - need exact match)
$form_key = isset( $search_field['original_widget_key'] ) && is_string( $search_field['original_widget_key'] )
? $search_field['original_widget_key']
: '';

if ( empty( $form_key ) || ! isset( $migrated_fields[ $form_key ] ) ) {
$category_id = absint( $migrated_fields[ $form_key ] );
if ( empty( $category_id ) ) {
continue;
}

// Get category ID from migrated submission field
$category_id = absint( $migrated_fields[ $form_key ] );

// Convert to search form conditional logic (uses 'category' field key)
$search_conditional_logic = $this->convert_assign_to_to_conditional_logic( $category_id, 'search' );
if ( empty( $search_conditional_logic ) || ! is_array( $search_conditional_logic ) ) {
continue;
}

if ( ! empty( $search_conditional_logic ) && is_array( $search_conditional_logic ) ) {
// Ensure options array exists
if ( ! isset( $search_field['options'] ) || ! is_array( $search_field['options'] ) ) {
$search_field['options'] = array();
}

// Add conditional logic to options
$search_field['options']['conditional_logic'] = array(
'type' => 'conditional-logic',
'value' => $search_conditional_logic,
);

// Set at root level for search form
$search_field['conditional_logic'] = $search_conditional_logic;

$search_form_fields['fields'][ $search_field_key ] = $search_field;
$search_updated = true;
// Cleanup broken old migration shape for option-list fields.
if ( ! empty( $search_field['options'] ) && is_array( $search_field['options'] ) && isset( $search_field['options'][0] ) && isset( $search_field['options']['conditional_logic'] ) ) {
unset( $search_field['options']['conditional_logic'] );
}

$search_field['conditional_logic'] = $search_conditional_logic;

$search_form_fields['fields'][ $search_field_key ] = $search_field;
$search_updated = true;
}

// Optimization: Save only if changes were made
if ( $search_updated ) {
update_term_meta( $directory_id, 'search_form_fields', $search_form_fields );
}
}

// Step 3: Also migrate search form fields that have their own assign_to (backward compatibility)
// Step 3: Backward compatibility - migrate search fields that still have own assign_to.
if ( ! empty( $search_form_fields['fields'] ) && is_array( $search_form_fields['fields'] ) ) {
$updated = $this->migrate_form_fields( $search_form_fields['fields'], 'search' );
if ( $updated ) {
Expand All @@ -239,7 +200,7 @@ private function migrate_directory_assign_to_fields( $directory_id ) {
/**
* Migrate assign_to fields in a fields array
*
* @param array $fields Fields array (passed by reference)
* @param array $fields Fields array (passed by reference)
* @param string $form_type Form type: 'submission' or 'search'
* @return bool True if any field was updated, false otherwise
*/
Expand All @@ -251,55 +212,38 @@ private function migrate_form_fields( &$fields, $form_type = 'submission' ) {
$updated = false;

foreach ( $fields as $field_key => $field ) {
if ( ! is_array( $field ) ) {
if ( ! is_array( $field ) || ! $this->is_custom_field_for_migration( $field ) ) {
continue;
}

// Only process custom fields
if ( ! $this->is_custom_field_for_migration( $field ) ) {
$existing_logic = $this->get_existing_conditional_logic( $field );
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue;
}

// Skip if field already has valid conditional_logic
if ( ! empty( $field['options']['conditional_logic']['value'] ) && is_array( $field['options']['conditional_logic']['value'] ) ) {
$existing_logic = $field['options']['conditional_logic']['value'];
if ( ! empty( $existing_logic['enabled'] ) && ! empty( $existing_logic['groups'] ) ) {
continue; // Already has valid conditional logic
}
}

// Security: Check for old assign_to field with proper validation
if ( empty( $field['assign_to'] ) || empty( $field['category'] ) ) {
continue;
}

// Security: Validate category ID is numeric
$category_id = is_numeric( $field['category'] ) ? absint( $field['category'] ) : null;
$category_id = is_numeric( $field['category'] ) ? absint( $field['category'] ) : 0;
if ( empty( $category_id ) ) {
continue;
}

// Convert category ID to conditional logic
$conditional_logic = $this->convert_assign_to_to_conditional_logic( $category_id, $form_type );
if ( empty( $conditional_logic ) || ! is_array( $conditional_logic ) ) {
continue;
}

if ( ! empty( $conditional_logic ) && is_array( $conditional_logic ) ) {
// Ensure options array exists
if ( ! isset( $field['options'] ) || ! is_array( $field['options'] ) ) {
$field['options'] = array();
}

// Add conditional logic to options
$field['options']['conditional_logic'] = array(
'type' => 'conditional-logic',
'value' => $conditional_logic,
);

// Set at root level for both forms (SearchForm also checks root level)
$field['conditional_logic'] = $conditional_logic;

$fields[ $field_key ] = $field;
$updated = true;
// Cleanup broken old migration shape for option-list fields.
if ( ! empty( $field['options'] ) && is_array( $field['options'] ) && isset( $field['options'][0] ) && isset( $field['options']['conditional_logic'] ) ) {
unset( $field['options']['conditional_logic'] );
}

$field['conditional_logic'] = $conditional_logic;

$fields[ $field_key ] = $field;
$updated = true;
}

return $updated;
Expand Down Expand Up @@ -385,6 +329,71 @@ private function is_custom_field_for_migration( $field ) {
return false;
}

/**
* Normalize field options to array without losing legacy data.
*
* Supports array, object, serialized string, and JSON string formats.
*
* @param mixed $options Raw field options.
* @return array
*/
private function normalize_field_options( $options ) {
if ( is_array( $options ) ) {
return $options;
}

if ( is_object( $options ) ) {
$normalized = json_decode( wp_json_encode( $options ), true );
return is_array( $normalized ) ? $normalized : array();
}

if ( is_string( $options ) && '' !== $options ) {
$unserialized = maybe_unserialize( $options );

if ( is_array( $unserialized ) ) {
return $unserialized;
}

if ( is_object( $unserialized ) ) {
$normalized = json_decode( wp_json_encode( $unserialized ), true );
return is_array( $normalized ) ? $normalized : array();
}

$decoded = json_decode( $options, true );
if ( JSON_ERROR_NONE === json_last_error() && is_array( $decoded ) ) {
return $decoded;
}
}

return array();
}

/**
* Get conditional logic from field safely.
*
* @param array $field Field data.
* @return array|null
*/
private function get_existing_conditional_logic( $field ) {
if ( ! is_array( $field ) ) {
return null;
}

if ( ! empty( $field['conditional_logic'] ) && is_array( $field['conditional_logic'] ) ) {
return $field['conditional_logic'];
}

if ( ! empty( $field['options'] )
&& is_array( $field['options'] )
&& ! empty( $field['options']['conditional_logic']['value'] )
&& is_array( $field['options']['conditional_logic']['value'] )
) {
return $field['options']['conditional_logic']['value'];
}

return null;
}

public function v8_force_migration() {

if ( get_option( 'directorist_v8_force_migrated' ) ) {
Expand Down
Loading