Changeset 2841215

Timestamp:

12/29/2022 07:01:45 PM (3 years ago)

Author:

Beee

Message:

Store as single meta

Location:

acf-city-selector/trunk

Files:

• ACF_City_Selector.php (modified) (5 diffs)
• admin/acf-city-selector-v5.php (modified) (18 diffs)
• admin/acfcs-countries.php (modified) (1 diff)
• admin/acfcs-info.php (modified) (1 diff)
• assets/css/general.css (modified) (2 diffs)
• inc/acfcs-actions.php (modified) (1 diff)
• inc/acfcs-ajax.php (modified) (2 diffs)
• inc/acfcs-functions.php (modified) (20 diffs)
• inc/form-handling.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

acf-city-selector/trunk/ACF_City_Selector.php

@@ -4 +4 @@
     Plugin URI:     https://acf-city-selector.com
     Description:    An extension for ACF which allows you to select a city based on country and province/state.
-    Version:        1.9.1
-    Tested up to:   6.0.2
+    Version:        1.10.0
+    Tested up to:   6.1.1
     Requires PHP:   7.0
     Author:         Beee
@@ -36 +36 @@
                     'db_version' => '1.0',
                     'url'        => plugin_dir_url( __FILE__ ),
-                    'version'    => '1.9.1',
+                    'version'    => '1.10.0',
                 );
 
@@ -109 +109 @@
                 do_action( 'acfcs_delete_transients' );
                 // other important stuff gets done in uninstall.php
-            }
-
-
-            /*
-             * Prepare database upon plugin activation
-             */
-            public function acfcs_fill_database() {
-                $countries = array( 'nl', 'be' );
-                foreach( $countries as $country ) {
-                    acfcs_import_data( $country . '.csv', ACFCS_PLUGIN_PATH . 'import/' );
-                }
             }
 
@@ -270 +259 @@
              */
             public function acfcs_settings_link( $links ) {
-                $settings_link = [ 'settings' => '<a href="options-general.php?page=acfcs-dashboard">' . esc_html__( 'Settings', 'acf-city-selector' ) . '</a>' ];
+                $settings_link = [ 'settings' => sprintf( '<a href="%s">%s</a>', admin_url( 'options-general.php?page=acfcs-dashboard' ), esc_html__( 'Settings', 'acf-city-selector' ) ) ];
 
                 return array_merge( $settings_link, $links );
@@ -383 +372 @@
              * @param $to_index
              */
-            public static function acfcs_move_array_element( &$array, $from_index, $to_index ) {
+            public function acfcs_move_array_element( &$array, $from_index, $to_index ) {
                 $splice = array_splice( $array, $from_index, 1 );
                 array_splice( $array, $to_index, 0, $splice );

acf-city-selector/trunk/admin/acf-city-selector-v5.php

@@ -11 +11 @@
          */
         class acf_field_city_selector extends acf_field {
-
             /*
              * Function index
@@ -26 +25 @@
              * acf_field_city_selector constructor
              *
-             * This function will setup the class functionality
+             * This function will set up the class functionality
              *
              * @param $settings
              */
             function __construct( $settings ) {
-
                 $this->name     = 'acf_city_selector';
                 $this->label    = 'City Selector';
@@ -37 +35 @@
                 $this->defaults = array(
                     'show_labels'  => 1,
+                    'store_meta'   => 0,
                     'which_fields' => 'all',
                     'use_select2'  => 0,
@@ -46 +45 @@
 
                 parent::__construct();
-
-            }
+            }
+
 
             /**
@@ -57 +56 @@
              */
             function render_field_settings( $field ) {
-
                 $select_options = array(
                     1 => esc_attr__( 'Yes', 'acf-city-selector' ),
@@ -72 +70 @@
                 ) );
 
-                acf_render_field_setting( $field, array(
+                acf_render_field_setting( $field, array(
                     'choices'      => $select_options,
                     'instructions' => esc_html__( 'Use select2 for dropdowns', 'acf-city-selector' ),
@@ -80 +78 @@
                     'type'         => 'radio',
                     'value'        => $field[ 'use_select2' ],
+                ) );
+
+                acf_render_field_setting( $field, array(
+                    'choices'      => $select_options,
+                    'instructions' => esc_html__( 'Store location as single meta values', 'acf-city-selector' ),
+                    'label'        => esc_html__( 'Store meta', 'acf-city-selector' ),
+                    'layout'       => 'horizontal',
+                    'name'         => 'store_meta',
+                    'type'         => 'radio',
+                    'value'        => $field[ 'store_meta' ],
                 ) );
 
@@ -107 +115 @@
             }
 
+
             /**
              * render_field()
@@ -115 +124 @@
              */
             function render_field( $field ) {
-
-                $default_country  = ( isset( $field[ 'default_country' ] ) && ! empty( $field[ 'default_country' ] ) ) ? $field[ 'default_country' ] : false;
-                $prefill_cities   = array();
-                $prefill_states   = array();
-                $selected_country = ( isset( $field[ 'value' ][ 'countryCode' ] ) ) ? $field[ 'value' ][ 'countryCode' ] : false;
-                $selected_state   = ( isset( $field[ 'value' ][ 'stateCode' ] ) ) ? $field[ 'value' ][ 'stateCode' ] : false;
-                $selected_city    = ( isset( $field[ 'value' ][ 'cityName' ] ) ) ? $field[ 'value' ][ 'cityName' ] : false;
-                $show_first       = true;
-                $which_fields     = ( isset( $field[ 'which_fields' ] ) ) ? $field[ 'which_fields' ] : 'all';
-
-                if ( false !== $default_country && false == $selected_country ) {
+                $default_country  = ( isset( $field[ 'default_country' ] ) && ! empty( $field[ 'default_country' ] ) ) ? $field[ 'default_country' ] : false;
+                $prefill_cities   = [];
+                $prefill_states   = [];
+                $selected_country = ( isset( $field[ 'value' ][ 'countryCode' ] ) ) ? $field[ 'value' ][ 'countryCode' ] : false;
+                $selected_state   = ( isset( $field[ 'value' ][ 'stateCode' ] ) ) ? $field[ 'value' ][ 'stateCode' ] : false;
+                $selected_city    = ( isset( $field[ 'value' ][ 'cityName' ] ) ) ? $field[ 'value' ][ 'cityName' ] : false;
+                $show_first       = true;
+                $store_meta       = ( isset( $field[ 'value' ][ 'store_meta' ] ) ) ? $field[ 'value' ][ 'store_meta' ] : false;
+                $which_fields     = ( isset( $field[ 'which_fields' ] ) ) ? $field[ 'which_fields' ] : 'all';
+
+                if ( false !== $default_country && false == $selected_country ) {
                     // New post with default country
                     if ( in_array( $which_fields, [ 'all', 'country_state', 'state_city' ] ) ) {
@@ -167 +176 @@
                     echo acfcs_render_dropdown( 'city', $field, $selected_city, $prefill_values );
                 }
+                if ( ! isset( $field[ 'parent_layout' ] ) && ! isset( $field[ 'parent_repeater' ] ) && $store_meta ) {
+                    echo acfcs_render_hidden_field( 'store_meta', '1' );
+                }
             }
 
@@ -177 +189 @@
              */
             function input_admin_enqueue_scripts() {
-
                 $plugin_url     = $this->settings[ 'url' ];
                 $plugin_version = $this->settings[ 'version' ];
@@ -192 +203 @@
                 $js_vars[ 'post_id' ]         = ( isset( $_GET[ 'post' ] ) ) ? (int) $_GET[ 'post' ] : false;
                 $js_vars[ 'show_labels' ]     = ( isset( $all_info[ 'show_labels' ] ) ) ? $all_info[ 'show_labels' ] : apply_filters( 'acfcs_show_labels', true );
+                $js_vars[ 'store_meta' ]      = ( isset( $all_info[ 'store_meta' ] ) ) ? $all_info[ 'store_meta' ] : false;
                 $js_vars[ 'use_select2' ]     = ( isset( $all_info[ 'use_select2' ] ) ) ? $all_info[ 'use_select2' ] : false;
                 $js_vars[ 'which_fields' ]    = ( isset( $all_info[ 'which_fields' ] ) ) ? $all_info[ 'which_fields' ] : 'all';
 
                 wp_localize_script( 'acfcs-process', 'city_selector_vars', $js_vars );
-
             }
 
@@ -214 +225 @@
              */
             function load_value( $value, $post_id, $field ) {
-
                 $state_code   = false;
                 $country_code = ( isset( $value[ 'countryCode' ] ) ) ? $value[ 'countryCode' ] : false;
@@ -231 +241 @@
                 if ( strlen( $country_code ) == 2 && false != $state_code ) {
                     global $wpdb;
-                    $sql_query              = $wpdb->prepare( "SELECT country, state_name FROM {$wpdb->prefix}cities WHERE country_code= %s AND state_code= %s", $country_code, $state_code );
-                    $row                    = $wpdb->get_row( $sql_query );
-                    $value[ 'stateCode' ]   = $state_code;
-                    $value[ 'stateName' ]   = ( isset( $row->state_name ) ) ? $row->state_name : false;
-                    $value[ 'countryName' ] = ( isset( $row->country ) ) ? $row->country : false;
+                    $table                  = $wpdb->prefix . 'cities';
+                    $sql_query              = $wpdb->prepare( "SELECT country, state_name FROM {$table} WHERE country_code = %s AND state_code = %s", $country_code, $state_code );
+                    $row                    = $wpdb->get_row( $sql_query );
+                    $value[ 'stateCode' ]   = $state_code;
+                    $value[ 'stateName' ]   = ( isset( $row->state_name ) ) ? $row->state_name : false;
+                    $value[ 'countryName' ] = ( isset( $row->country ) ) ? $row->country : false;
                 }
 
@@ -255 +266 @@
              */
             function update_value( $value, $post_id, $field ) {
-
                 $required = $field[ 'required' ];
                 if ( 0 == $required ) {
@@ -316 +326 @@
                 }
 
+                if ( ! isset( $field[ 'parent_layout' ] ) && ! isset( $field[ 'parent_repeater' ] ) ) {
+                    do_action( 'acfcs_store_meta', $value, $post_id );
+                }
+
                 return $value;
-
             }
 
@@ -336 +349 @@
              */
             function validate_value( $valid, $value, $field, $input ) {
-
                 if ( 1 == $field[ 'required' ] ) {
                     $nothing       = esc_html__( "You didn't select anything.", 'acf-city-selector' );
@@ -384 +396 @@
 
         new acf_field_city_selector( $this->settings );
-
     }

acf-city-selector/trunk/admin/acfcs-countries.php

@@ -52 +52 @@
                             <p>
                                 <?php esc_html_e( "And now you can !! We have created several 'country packages' for you to import 'as is'.", 'acf-city-selector' ); ?>
-                                <?php echo sprintf( __( 'Download them %s.', 'acf-city-selector' ), sprintf( '<a href="%s">%s</a>', esc_url( ACFCS_WEBSITE_URL . '/get-countries/' ), __( 'here', 'acf-city-selector' ) ) ); ?>
+                                <?php echo sprintf( esc_html__( 'Download them %s.', 'acf-city-selector' ), sprintf( '<a href="%s" target="_blank" rel="noopener">%s</a>', esc_url( ACFCS_WEBSITE_URL . '/get-countries/' ), esc_html__( 'here', 'acf-city-selector' ) ) ); ?>
                             </p>
                         </div>

acf-city-selector/trunk/admin/acfcs-info.php

@@ -27 +27 @@
                             <p>
                                 <?php esc_html_e( 'This page shows real-time info about your site and settings.', 'acf-city-selector' ); ?>
-                                <br />
-                                <?php esc_html_e( 'We might ask for this info if support is helping you fix a problem.', 'acf-city-selector' ); ?>
                             </p>
                         </div>

acf-city-selector/trunk/assets/css/general.css

@@ -1 +1 @@
 /* errors */
 .acfcs .notice--error {
-    border-left-color: #dc3232;
+    border-left-color: #dc3232;
 }
 
 .acfcs .notice--success {
-    border-left-color: #43bc71;
+    border-left-color: #43bc71;
 }
 
 .acfcs .notice--warning {
-    border-left-color: #ff9000;
+    border-left-color: #ff9000;
 }
 
 .acfcs .notice--info {
-    border-left-color: #00a0d2;
+    border-left-color: #00a0d2;
 }
 
 .acfcs .field__message {
-    background-color:  #f9f9f9;
-    border-left:       2px solid #ccd0d4;
-    border-top:        1px solid #ccd0d4;
-    border-right:      1px solid #ccd0d4;
-    border-bottom:     1px solid #ccd0d4;
-    margin-bottom:     1rem;
-    padding:           5px;
+    background-color: #f9f9f9;
+    border-left:      2px solid #ccd0d4;
+    border-top:       1px solid #ccd0d4;
+    border-right:     1px solid #ccd0d4;
+    border-bottom:    1px solid #ccd0d4;
+    margin-bottom:    1rem;
+    padding:          5px;
 }
 
 .acfcs .field__message--error {
-    border-left-color: #dc3232;
+    border-left-color: #dc3232;
 }
 
 .acfcs .field__message--warning {
-    border-left-color: #ff9000;
+    border-left-color: #ff9000;
 }
 
@@ -37 +37 @@
 /* not actively supported anymore */
 .field_type-acf_city_selector .acfcs__dropdown-box {
-    margin-bottom: 1rem;
+    margin-bottom: 1rem;
 }
 
 .field_type-acf_city_selector span.acf-input-header {
-    display:       block;
-    margin-bottom: 10px;
+    display:       block;
+    margin-bottom: 10px;
 }
 
 /* edit post screens v5 */
 .acf-field-acf-city-selector .acfcs__dropdown-box {
-    margin-bottom: 1rem;
+    margin-bottom: 1rem;
+}
+
+.acf-field-acf-city-selector .acfcs__checkbox {
+    display:   flex;
+    flex-flow: row nowrap;
+    align-items: center;
+}
+
+.acfcs__checkbox input[type="checkbox"] {
+    margin-right: 0.5rem;
+}
+
+.acfcs__checkbox label {
+    vertical-align: initial;
 }
 
 .acf-field.acf-field-acf-city-selector select.acfcs__dropdown {
-    padding: 4px;
+    padding: 4px;
 }
 
 .acf-field-acf-city-selector .acf-input-header {
-    margin-bottom: 10px;
+    margin-bottom: 10px;
 }

acf-city-selector/trunk/inc/acfcs-actions.php

@@ -48 +48 @@
     }
     add_action( 'acfcs_after_success_import', 'acfcs_reimport_cities' );
+
+
+    /**
+     * Save location as single meta values
+     *
+     * @param $value
+     * @param $post_id
+     *
+     * @return void
+     */
+    function acfcs_save_single_meta( $value, $post_id ) {
+        if ( isset( $_POST[ 'store_meta' ] ) && 1 == $_POST[ 'store_meta' ] ) {
+            if ( ! empty( $value[ 'countryCode' ] ) ) {
+                update_post_meta( $post_id, 'acfcs_search_country', $value[ 'countryCode' ] );
+            }
+            if ( ! empty( $value[ 'stateCode' ] ) ) {
+                update_post_meta( $post_id, 'acfcs_search_state', $value[ 'stateCode' ] );
+            }
+            if ( ! empty( $value[ 'cityName' ] ) ) {
+                update_post_meta( $post_id, 'acfcs_search_city', $value[ 'cityName' ] );
+            }
+        } elseif ( $post_id ) {
+            // remove meta
+            delete_post_meta( $post_id, 'acfcs_search_country' );
+            delete_post_meta( $post_id, 'acfcs_search_state' );
+            delete_post_meta( $post_id, 'acfcs_search_city' );
+        }
+    }
+    add_action( 'acfcs_store_meta', 'acfcs_save_single_meta', 10, 2 );

acf-city-selector/trunk/inc/acfcs-ajax.php

@@ -28 +28 @@
             }
 
-            if ( ! isset( $field[ 'show_labels' ] ) ) {
-                if ( isset( $_POST[ 'show_labels' ] ) ) {
-                    $field[ 'show_labels' ] = ( '1' == sanitize_text_field( $_POST[ 'show_labels' ] ) ) ? true : false;
-                }
-            }
+            if ( ! isset( $field[ 'show_labels' ] ) && isset( $_POST[ 'show_labels' ] ) ) {
+                $field[ 'show_labels' ] = ( '1' == sanitize_text_field( $_POST[ 'show_labels' ] ) ) ? true : false;
+            }
 
             if ( isset( $country_code ) ) {
@@ -83 +81 @@
             }
 
-            if ( ! isset( $field[ 'show_labels' ] ) ) {
-                if ( isset( $_POST[ 'show_labels' ] ) ) {
-                    $show_labels = sanitize_text_field( $_POST[ 'show_labels' ] );
-                    if ( '1' == $show_labels ) {
-                        $field[ 'show_labels' ] = true;
-                    } elseif ( '0' == $show_labels ) {
-                        $field[ 'show_labels' ] = false;
-                    }
-                }
+            if ( ! isset( $field[ 'show_labels' ] ) && isset( $_POST[ 'show_labels' ] ) ) {
+                $show_labels = sanitize_text_field( $_POST[ 'show_labels' ] );
+                if ( '1' == $show_labels ) {
+                    $field[ 'show_labels' ] = true;
+                } elseif ( '0' == $show_labels ) {
+                    $field[ 'show_labels' ] = false;
+                }
             }
 

acf-city-selector/trunk/inc/acfcs-functions.php

@@ -29 +29 @@
         }
 
-        global $wpdb;
-        $results = $wpdb->get_results( "
-            SELECT * FROM {$wpdb->prefix}cities
-            GROUP BY country
-            ORDER BY country ASC
-        " );
+        global $wpdb;
+        $table   = $wpdb->prefix . 'cities';
+        $results = $wpdb->get_results( "SELECT * FROM $table GROUP BY country ORDER BY country ASC" );
 
         if ( ! empty( $results ) ) {
@@ -46 +43 @@
         }
 
-
         return $countries;
     }
@@ -76 +72 @@
             $transient = get_transient( 'acfcs_states_' . strtolower( $country_code ) );
             if ( false == $transient || is_array( $transient ) && empty( $transient ) ) {
-                $order = 'ORDER BY state_name ASC';
+                $order = ' ORDER BY state_name ASC';
                 if ( 'FR' == $country_code ) {
-                    $order = "ORDER BY LENGTH(state_name), state_name";
-                }
-
-                global $wpdb;
-                $sql = $wpdb->prepare( "
-                    SELECT *
-                    FROM {$wpdb->prefix}cities
-                    WHERE country_code = %s
-                    GROUP BY state_code
-                    " . $order, strtoupper( $country_code )
-                );
-                $results = $wpdb->get_results( $sql );
+                    $order = " ORDER BY LENGTH(state_name), state_name";
+                }
+
+                global $wpdb;
+                $table   = $wpdb->prefix . 'cities';
+                $sql     = $wpdb->prepare( "SELECT * FROM $table WHERE country_code = %s GROUP BY state_code" . $order, strtoupper( $country_code ) );
+                $results = $wpdb->get_results( $sql );
 
                 $state_results = array();
@@ -151 +142 @@
             if ( false !== $country_code ) {
                 global $wpdb;
-                $query = "SELECT * FROM {$wpdb->prefix}cities";
+                $table = $wpdb->prefix . 'cities';
+                $query = "SELECT * FROM $table";
                 if ( $country_code && $state_code ) {
                     if ( 3 < strlen( $state_code ) ) {
@@ -198 +190 @@
     function acfcs_get_country_name( $country_code = false ) {
         if ( false != $country_code ) {
-            global $wpdb;
-            $country = $wpdb->get_row( $wpdb->prepare( "SELECT country FROM {$wpdb->prefix}cities WHERE country_code = %s", $country_code ) );
+            global $wpdb;
+            $table   = $wpdb->prefix . 'cities';
+            $query   = $wpdb->prepare( "SELECT country FROM $table WHERE country_code = %s", $country_code );
+            $country = $wpdb->get_row( $query );
+
             if ( isset( $country->country ) ) {
                 return $country->country;
@@ -215 +210 @@
 
     /**
-     * Checks if there any cities in the database (for page availability)
+     * Checks if there are any cities in the database (for page availability)
      *
      * @param $country_code
@@ -223 +218 @@
     function acfcs_has_cities( $country_code = false ) {
         global $wpdb;
-        $query = "SELECT * FROM {$wpdb->prefix}cities LIMIT 1";
+        $table = $wpdb->prefix . 'cities';
+        $query = "SELECT * FROM $table LIMIT 1";
         if ( $country_code ) {
-            $query = $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}cities WHERE country_code = %s LIMIT 1", $country_code );
+            $query = $wpdb->prepare( "SELECT * FROM $table WHERE country_code = %s LIMIT 1", $country_code );
         }
 
@@ -244 +240 @@
      */
     function acfcs_check_if_files() {
-        $target_dir = acfcs_upload_folder();
-        if ( is_dir( $target_dir ) ) {
+        $actual_files = [];
+        $target_dir   = acfcs_upload_folder();
+
+        if ( is_dir( $target_dir ) ) {
             $file_index = scandir( $target_dir );
             $excluded_files = [
@@ -255 +253 @@
 
             if ( is_array( $file_index ) ) {
-                $actual_files = array();
                 foreach ( $file_index as $file ) {
                     if ( ! in_array( $file, $excluded_files ) ) {
@@ -267 +264 @@
         }
 
-        return array();
+        return $actual_files;
     }
 
@@ -439 +436 @@
     function acfcs_get_countries_info() {
         global $wpdb;
-        $results = $wpdb->get_results( "
-                SELECT country_code FROM {$wpdb->prefix}cities
-                GROUP BY country_code
-                ORDER BY country_code ASC
-            " );
+        $table   = $wpdb->prefix . 'cities';
+        $results = $wpdb->get_results( "SELECT country_code FROM $table GROUP BY country_code ORDER BY country_code ASC" );
 
         $acfcs_info = array();
         foreach ( $results as $data ) {
-            $country_code = $data->country_code;
-            $results      = $wpdb->get_results( $wpdb->prepare( "
-                SELECT * FROM {$wpdb->prefix}cities
-                WHERE country_code = %s
-                ORDER BY country_code ASC
-            ", $country_code ) );
+            $country_code = $data->country_code;
+            $query        = $wpdb->prepare( "SELECT * FROM $table WHERE country_code = %s ORDER BY country_code ASC", $country_code );
+            $results      = $wpdb->get_results( $query );
 
             $acfcs_info[ $country_code ] = [
@@ -589 +580 @@
 
 
+    function acfcs_render_hidden_field( $name, $value ) {
+        if ( $name && $value ) {
+            return sprintf( '<input type="hidden" name="%s" value="%s" />', $name, $value );
+        }
+
+        return false;
+    }
+
+
     /**
      * Verify CSV data
@@ -726 +726 @@
         if ( ! empty( $sanitized_country_codes ) ) {
             global $wpdb;
-            $country_string = strtoupper( "'" . implode( "', '", $sanitized_country_codes ) . "'" );
-            $query          = "DELETE FROM {$wpdb->prefix}cities WHERE `country_code` IN ({$country_string})";
-            $result         = $wpdb->query( $query );
+            $table          = $wpdb->prefix . 'cities';
+            $country_string = strtoupper( "'" . implode( "', '", $sanitized_country_codes ) . "'" );
+            $query          = $wpdb->prepare( "DELETE FROM $table WHERE `country_code` IN (%s)", $country_string );
+            $result         = $wpdb->query( $query );
+
             if ( $result > 0 ) {
                 ACF_City_Selector::acfcs_errors()->add( 'success_country_remove', sprintf( esc_html__( 'You have successfully removed all entries for %s.', 'acf-city-selector' ), $country_names_and ) );
@@ -763 +765 @@
      */
     function acfcs_render_preview_results( $csv_data = [] ) {
-        if ( ! empty( $csv_data ) ) {
+        $table = '';
+        if ( ! empty( $csv_data ) ) {
             $table_columns = [
                 esc_html__( 'City', 'acf-city-selector' ),
@@ -789 +792 @@
             $table_body = sprintf( '<tbody>%s</tbody>', $table_rows );
             $table      = sprintf( '<table class="acfcs__table acfcs__table--preview-result scrollable">%s%s</table>', $table_headers, $table_body );
-
-            return $table;
-        }
-
-        return '';
+        }
+
+        return $table;
     }
 
@@ -806 +807 @@
     function acfcs_get_states_optgroup() {
         $results = acfcs_get_countries( false );
+        $states  = [];
+
         // if there is at least 1 country
         if ( ! empty( $results ) ) {
@@ -817 +820 @@
             // get states for these countries
             if ( ! empty( $countries ) ) {
-                global $wpdb;
-                $states = array();
-                foreach ( $countries as $country ) {
+                global $wpdb;
+                $table  = $wpdb->prefix . 'cities';
+
+                foreach ( $countries as $country ) {
                     $states[] = array(
                         'state' => 'open_optgroup',
@@ -830 +834 @@
                     }
 
-                    $query   = "SELECT * FROM {$wpdb->prefix}cities WHERE country_code = %s GROUP BY state_code " . $order;
+                    $query   = "SELECT * FROM $table WHERE country_code = %s GROUP BY state_code " . $order;
                     $sql     = $wpdb->prepare( $query, $country[ 'code' ] );
                     $results = $wpdb->get_results( $sql );
@@ -848 +852 @@
                     );
                 }
-
-                return $states;
-            }
-        }
-
-        return [];
+            }
+        }
+
+        return $states;
     }
 
@@ -905 +907 @@
         }
 
-        $sql = "SELECT * FROM {$wpdb->prefix}cities
-                " . $where . "
-                " . $orderby . "
-                " . $search_limit . "
-            ";
-        $cities = $wpdb->get_results( $sql );
+        $table  = $wpdb->prefix . 'cities';
+        $query  = $wpdb->prepare( "SELECT * FROM $table %s %s %s", $where, $orderby, $search_limit );
+        $cities = $wpdb->get_results( $query );
 
         return $cities;

acf-city-selector/trunk/inc/form-handling.php

@@ -119 +119 @@
                         }
                     }
-                    $cities  = implode( ', ', $cities );
-                    $row_ids = implode( ',', $ids );
-                    $query   = "DELETE FROM " . $wpdb->prefix . "cities WHERE id IN (" . $row_ids . ")";
-                    $amount  = $wpdb->query( $query );
+                    $cities  = implode( ', ', $cities );
+                    $row_ids = implode( ',', $ids );
+                    $table   = $wpdb->prefix . 'cities';
+                    $query   = $wpdb->prepare( "DELETE FROM {$table} WHERE id IN (%s)", $row_ids );
+                    $amount  = $wpdb->query( $query );
 
                     if ( $amount > 0 ) {

acf-city-selector/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.6.0
 Requires PHP: 7.0
-Tested up to: 6.0.2
-Stable tag: 1.9.1
+Tested up to: 6.1.1
+Stable tag: 1.10.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-This plugins adds a new (ACF) field to select a city depending on country and state/province.
+This plugin adds a new (ACF) field to select a city depending on country and state/province.
 
 == Description ==
@@ -42 +42 @@
 == Changelog ==
 
+= 1.10.0 =
+* Add option to store location as single meta values
+* Fix ordering for states (which caused some issues)
+
 = 1.9.1 =
 * fix incorrect version