| @@ -88,9 +88,8 @@ | ||
| 88 | 88 | |
| 89 | 89 | wp_send_json_success( |
| 90 | 90 | array( |
| 91 | 91 | 'verificationDetails' => $verification_details, |
| 92 | - 'hash' => md5( serialize( $verification_details ) ), | |
| 93 | 92 | ) |
| 94 | 93 | ); |
| 95 | 94 | } |
| 96 | 95 | |
| @@ -154,49 +153,20 @@ | ||
| 154 | 153 | ); |
| 155 | 154 | $details['email'] = FrmTransLiteAppHelper::process_shortcodes( $shortcode_atts ); |
| 156 | 155 | } |
| 157 | 156 | |
| 158 | - self::maybe_add_address_data( $details, $address, (int) $address_setting ); | |
| 157 | + if ( is_array( $address ) && isset( $address['line1'] ) && isset( $address['line2'] ) && is_callable( 'FrmProAddressesController::get_country_code' ) ) { | |
| 158 | + $details['addressLines'] = array( $address['line1'], $address['line2'] ); | |
| 159 | + $details['city'] = $address['city']; | |
| 160 | + $details['state'] = $address['state']; | |
| 161 | + $details['postalCode'] = $address['zip']; | |
| 162 | + $details['countryCode'] = FrmProAddressesController::get_country_code( $address['country'] ); | |
| 163 | + } | |
| 159 | 164 | |
| 160 | 165 | return $details; |
| 161 | 166 | } |
| 162 | 167 | |
| 163 | 168 | /** |
| 164 | - * @since 6.25 | |
| 165 | - * | |
| 166 | - * @param array $details | |
| 167 | - * @param array $address | |
| 168 | - * @param int $address_field_id | |
| 169 | - * @return void | |
| 170 | - */ | |
| 171 | - private static function maybe_add_address_data( &$details, $address, $address_field_id ) { | |
| 172 | - if ( ! is_array( $address ) || ! isset( $address['line1'] ) || ! isset( $address['line2'] ) || ! is_callable( 'FrmProAddressesController::get_country_code' ) ) { | |
| 173 | - return; | |
| 174 | - } | |
| 175 | - | |
| 176 | - $address_field = FrmField::getOne( $address_field_id ); | |
| 177 | - if ( ! $address_field ) { | |
| 178 | - return; | |
| 179 | - } | |
| 180 | - | |
| 181 | - if ( 'us' === $address_field->field_options['address_type'] ) { | |
| 182 | - $country_code = 'US'; | |
| 183 | - } else { | |
| 184 | - $country_code = FrmProAddressesController::get_country_code( $address['country'] ); | |
| 185 | - } | |
| 186 | - | |
| 187 | - if ( ! $address['line1'] && ! $address['line2'] && ! $address['city'] && ! $address['state'] && ! $address['zip'] && ! $country_code ) { | |
| 188 | - return; | |
| 189 | - } | |
| 190 | - | |
| 191 | - $details['addressLines'] = array( $address['line1'], $address['line2'] ); | |
| 192 | - $details['city'] = $address['city']; | |
| 193 | - $details['state'] = $address['state']; | |
| 194 | - $details['postalCode'] = $address['zip']; | |
| 195 | - $details['countryCode'] = $country_code; | |
| 196 | - } | |
| 197 | - | |
| 198 | - /** | |
| 199 | 169 | * Create an entry object with posted values. |
| 200 | 170 | * |
| 201 | 171 | * @since 6.22 |
| 202 | 172 | * @return stdClass |
| @@ -201,13 +171,12 @@ | ||
| 201 | 171 | * @since 6.22 |
| 202 | 172 | * @return stdClass |
| 203 | 173 | */ |
| 204 | 174 | private static function generate_false_entry() { |
| 205 | - $entry = new stdClass(); | |
| 206 | - $entry->post_id = 0; | |
| 207 | - $entry->id = 0; | |
| 208 | - $entry->item_key = ''; | |
| 209 | - $entry->metas = array(); | |
| 175 | + $entry = new stdClass(); | |
| 176 | + $entry->post_id = 0; | |
| 177 | + $entry->id = 0; | |
| 178 | + $entry->metas = array(); | |
| 210 | 179 | |
| 211 | 180 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 212 | 181 | foreach ( $_POST as $k => $v ) { |
| 213 | 182 | $k = sanitize_text_field( stripslashes( $k ) ); |
