GeoDirectory / geodirectory

geodirectory-functions/custom_fields_functions.php

Spacing +350 added lines, -350 removed lines

@@ -49,7 +49,7 @@ 
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -74,7 +74,7 @@ 
 {

     global $wpdb, $geodir_post_custom_fields_cache;

 

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;

 

     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

         return $geodir_post_custom_fields_cache[$cache_stored];

@@ -88,14 +88,14 @@ 
         $default_query .= " and is_admin = '0' ";

 

     if ($fields_location == 'none') {

-    } else{

-        $fields_location = esc_sql( $fields_location );

+    } else {

+        $fields_location = esc_sql($fields_location);

         $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

     }

 

     $post_meta_info = $wpdb->get_results(

         $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

             array($post_type)

         )

     );

@@ -162,13 +162,13 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param string $field_type_key The key of the custom field.

      */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

 

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));

 

         } else {

             $field_info = $cf;

@@ -202,14 +202,14 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {

+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

                 $htmlvar_name = $field->htmlvar_name;

 

                 if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

                 }

 

                 /**

@@ -223,18 +223,18 @@ 
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

 

                 if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");

                 } else {

                     if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");

                     }

                 }

 

@@ -304,7 +304,7 @@ 
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

 

         // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {

             $request_field['data_type'] = 'VARCHAR';

         }

 

@@ -317,12 +317,12 @@ 
         $post_type = $request_field['listing_type'];

 

         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;

         }

 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",

                 array($cf, $cehhtmlvar_name, $post_type)

             )

         );

@@ -334,7 +334,7 @@ 
 

                 $post_meta_info = $wpdb->get_row(

                     $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",

                         array($cf)

                     )

                 );

@@ -352,7 +352,7 @@ 
             if ($post_type == '') $post_type = 'gd_place';

 

 

-            $detail_table = $plugin_prefix . $post_type . '_detail';

+            $detail_table = $plugin_prefix.$post_type.'_detail';

 

             $admin_title = $request_field['admin_title'];

             $site_title = $request_field['site_title'];

@@ -380,12 +380,12 @@ 
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             

-            if(is_array($show_in)){

+            if (is_array($show_in)) {

                 $show_in = implode(",", $request_field['show_in']);

             }

             

             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

+                $htmlvar_name = 'geodir_'.$htmlvar_name;

             }

 

             $option_values = '';

@@ -426,9 +426,9 @@ 
 

             if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -440,15 +440,15 @@ 
                     case 'address':

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

-                        $old_prefix = $old_html_variable . '_';

+                        $old_prefix = $old_html_variable.'_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $wpdb->query($meta_field_add);

@@ -457,12 +457,12 @@ 
 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -470,9 +470,9 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

 

                                 }

 

@@ -482,36 +482,36 @@ 
 

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -519,24 +519,24 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -544,128 +544,128 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

 

                                 }

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 15 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

                                 }

 

 

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

 

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

                                 }

 

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

                                     $wpdb->query($meta_field_add);

                                 } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 }

 

                             }

@@ -681,30 +681,30 @@ 
                         $op_size = '500';

 

                         // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

+                        if (isset($option_values) && $option_values && $field_type == 'select') {

+                            $option_values_arr = explode(',', $option_values);

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                                foreach ($option_values_arr as $op_val) {

+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                                 }

-                                if($op_max){$op_size =$op_max; }

+                                if ($op_max) {$op_size = $op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                            if (strlen($option_values)) {

+                                $op_size = strlen($option_values);

                             }

                         }

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

 

                         if (isset($request_field['cat_display_type']))

@@ -721,9 +721,9 @@ 
                     case 'url':

                     case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -737,24 +737,24 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";

                             } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -770,7 +770,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -804,7 +804,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -814,7 +814,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

                         array($site_title, $post_type, $htmlvar_name)

@@ -823,7 +823,7 @@ 
 

 

                 if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

 

 

                 /**

@@ -843,7 +843,7 @@ 
                         $data_type = '';

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -851,109 +851,109 @@ 
 

                         $meta_field_add = "VARCHAR( 254 ) NULL";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);

                         //$wpdb->query($meta_field_add);

 

 

                         if (!empty($extra_fields)) {

 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

 

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 $meta_field_add .= " DEFAULT '1'";

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                         }

@@ -963,8 +963,8 @@ 
                     case 'checkbox':

                         $data_type = 'TINYINT';

 

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -997,7 +997,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 

                             if (isset($request_field['multi_display_type'])) {

@@ -1005,9 +1005,9 @@ 
                             }

                         }

 

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

+                        $meta_field_add = $data_type."( $op_size ) NULL ";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

@@ -1022,9 +1022,9 @@ 
 

                         $data_type = 'TEXT';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

                         /*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

@@ -1039,9 +1039,9 @@ 
 

                         $data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1054,9 +1054,9 @@ 
 

                         $data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1068,22 +1068,22 @@ 
                     default:

 

                         if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+                            $meta_field_add = $data_type." NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

                             $meta_field_add = " VARCHAR( 254 ) NULL ";

 

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

@@ -1105,7 +1105,7 @@ 
 

                     $wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1138,7 +1138,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1150,7 +1150,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1183,7 +1183,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -1199,11 +1199,11 @@ 
 }

 

 

-function geodir_get_cf_value($cf){

+function geodir_get_cf_value($cf) {

     global $gd_session;

     $value = '';

     if (is_admin()) {

-        global $post,$gd_session;

+        global $post, $gd_session;

 

         if (isset($_REQUEST['post']))

             $_REQUEST['pid'] = $_REQUEST['post'];

@@ -1251,7 +1251,7 @@ 
         $is_default = $val['is_default'];

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1276,11 +1276,11 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_after_custom_form_field_$name'

          */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

 

         $custom_field = $val;

-        $html ='';

+        $html = '';

         /**

          * Filter the output for custom fields.

          *

@@ -1289,7 +1289,7 @@ 
          * @param string $html The html to be filtered (blank).

          * @param array $custom_field The custom field array values.

          */

-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

+        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);

 

 

 

@@ -1304,7 +1304,7 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_before_custom_form_field_$name'

          */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

     }

 

@@ -1330,7 +1330,7 @@ 
 

         $filter = $wpdb->get_row(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",

                 array($geodir_post_type)

             )

         );

@@ -1345,14 +1345,14 @@ 
 }

 

 

-function geodir_field_icon_proccess($cf){

+function geodir_field_icon_proccess($cf) {

 

 

     if (strpos($cf['field_icon'], 'http') !== false) {

-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

+        $field_icon = '<i class="'.$cf['field_icon'].'"></i>';

+    } else {

         $field_icon = $cf['field_icon'];

     }

 

@@ -1402,7 +1402,7 @@ 
                 $field_icon = geodir_field_icon_proccess($type);

                 $filed_type = $type['type'];

                 $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                if($html_var=='post'){$html_var='post_address';}

+                if ($html_var == 'post') {$html_var = 'post_address'; }

 

                 /**

                  * Filter the output for custom fields.

@@ -1413,7 +1413,7 @@ 
                  * @param string $fields_location The location the field is to be show.

                  * @param array $type The array of field values.

                  */

-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+                $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);

 

                 $variables_array = array();

 

@@ -1542,7 +1542,7 @@ 
 

         $post_type = get_post_type($post_id);

         //echo $field_id; exit;

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

 

         $postcurr_images = array();

         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

@@ -1561,13 +1561,13 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

                 /* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

                     $curr_img_url = $post_image[$m];

@@ -1593,24 +1593,24 @@ 
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

                     if (!function_exists('wp_handle_upload'))

-                        require_once(ABSPATH . 'wp-admin/includes/file.php');

+                        require_once(ABSPATH.'wp-admin/includes/file.php');

 

                     if (!is_dir($geodir_uploadpath))

                         mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

                     if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

+                        $img_path = $geodir_uploadpath.'/'.$filename;

+                        $img_url = $geodir_uploadurl.'/'.$filename;

                     } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                     }

 

                     $uploaded_file = '';

                     if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

 

                     if ($curr_img_dir != $geodir_uploaddir) {

                         if (file_exists($img_path))

@@ -1618,7 +1618,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                        $file_urls = $geodir_uploadurl.'/'.$new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1632,8 +1632,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -1685,9 +1685,9 @@ 
     function geodir_upload_dir($upload)

     {

         global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;

+        $upload['path'] = $upload['basedir'].$upload['subdir'];

+        $upload['url'] = $upload['baseurl'].$upload['subdir'];

         return $upload;

     }

 

@@ -1702,20 +1702,20 @@ 
         // check ajax noonce

         $imgid = $_POST["imgid"];

 

-        check_ajax_referer($imgid . 'pluploadan');

+        check_ajax_referer($imgid.'pluploadan');

 

         // handle custom file uploaddir

         add_filter('upload_dir', 'geodir_upload_dir');

 

         // change file orinetation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);

 

         // handle file upload

         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

         // remove handle custom file uploaddir

         remove_filter('upload_dir', 'geodir_upload_dir');

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -1745,9 +1745,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_video;

@@ -1771,9 +1771,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_special_offers;

@@ -1791,12 +1791,12 @@ 
      */

     function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024).'kb';

         } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

         }

         /** Filter documented in geodirectory-functions/general_functions.php **/

         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

@@ -1828,7 +1828,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

                     array($post_type)

                 ), 'ARRAY_A'

             );

@@ -1955,7 +1955,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -2037,14 +2037,14 @@ 
 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",

                 array($cehhtmlvar_name, $post_type, $field_type)

             )

         );

 

         if ($is_default == 1) {

 

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));

 

         }

 

@@ -2055,7 +2055,7 @@ 
 

                 $wpdb->prepare(

 

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2086,7 +2086,7 @@ 
 

                 $wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2112,7 +2112,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -2135,7 +2135,7 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));

 

             return $field_id;

 

@@ -2158,12 +2158,12 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param bool $default when set to true field will be for admin use only.

      */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));

         } else {

             $field_info = $cf;

             $result_str = $cf->id;

@@ -2199,18 +2199,18 @@ 
         if ($htmlvar_name == '')

             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

 

         $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

         $cso_arr = geodir_get_custom_sort_options($post_type);

 

         $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

-        foreach($cso_arr as $cso){

-            if($cur_field_type==$cso['field_type']){

+        foreach ($cso_arr as $cso) {

+            if ($cur_field_type == $cso['field_type']) {

 

                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

+                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {

                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

                 }

 

@@ -2220,40 +2220,40 @@ 
         $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

         ?>

 

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

             <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

 

 

-                <?php echo $field_icon;?>

+                <?php echo $field_icon; ?>

                 <b style="cursor:pointer;"

-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>

+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>

 

             </div>

 

-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"

+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

                     echo $field_info->data_type;

                 }?>"/>

-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>

 

 

                 <ul class="widefat post fixed" border="0" style="width:100%;">

@@ -2263,7 +2263,7 @@ 
                         <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/>

 

                         <li>

-                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?>

+                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?>

 

                             <label for="asc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>

@@ -2273,24 +2273,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"

+                                <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?>

 

                             <label for="asc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>

@@ -2300,14 +2300,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2318,7 +2318,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2328,7 +2328,7 @@ 
 

 

                         <li>

-                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?>

+                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?>

 

                             <label for="desc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>

@@ -2338,24 +2338,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"

+                                <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?>

 

                             <label for="desc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>

@@ -2365,13 +2365,13 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2382,7 +2382,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2407,14 +2407,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" />

+                                <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

                         <li>

-                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?>

+                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2438,7 +2438,7 @@ 
 

 

                     <li>

-                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?>

+                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?>

 

                         <label for="is_active" class="gd-cf-tooltip-wrap">

                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>

@@ -2448,17 +2448,17 @@ 
                         </label>

                         <div class="gd-cf-input-wrap gd-switch">

 

-                            <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

+                            <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"

                                 <?php if ($value == '1') {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                            <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

+                            <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"

                                 <?php if ($value == '0' || !$value) {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

 

@@ -2479,10 +2479,10 @@ 
                             <h3></h3>

                         </label>

                         <div class="gd-cf-input-wrap">

-                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                                    onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>

-                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

-                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

+                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                     class="button"/></a>

                         </div>

                     </li>

@@ -2517,7 +2517,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

@@ -2639,7 +2639,7 @@ 
 }

 

 

-function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {

     ob_start();

     ?>

     <li>

@@ -2685,43 +2685,43 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);

+add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);

 

 // htmlvar not needed for fieldset and taxonomy

-add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);

+add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);

 

 

 // default_value not needed for textarea, html, file, fieldset, taxonomy, address

-add_filter('geodir_cfa_default_value_textarea','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_html','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_default_value_textarea', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_html', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);

 

 // is_required not needed for fieldset

-add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);

 

 // field_icon not needed for fieldset

-add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);

 

 // cat_sort not needed for some fields

-add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);

+add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);

 

 

 

-function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){

-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

+function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {

+    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }

     ob_start();

     ?>

     <li>

@@ -2752,16 +2752,16 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);

+add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);

 

 

-function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $value = '';

     if (isset($field_info->validation_pattern)) {

         $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {

         $value = esc_attr($cf['defaults']['validation_pattern']);

     }

     ?>

@@ -2781,7 +2781,7 @@ 
     $value = '';

     if (isset($field_info->validation_msg)) {

         $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {

         $value = esc_attr($cf['defaults']['validation_msg']);

     }

     ?>

@@ -2802,10 +2802,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);

+add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);

 

 

-function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){

+function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {

     ob_start();

     global $post_type;

 

@@ -2830,7 +2830,7 @@ 
                     ?>

                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

                         echo 'selected="selected"';

-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php

                 }

                 ?>

             </select>

@@ -2841,7 +2841,7 @@ 
         <label for="cat_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>

+                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2849,19 +2849,19 @@ 
             <select name="cat_display_type" id="cat_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

                     echo 'selected="selected"';

-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

                     echo 'selected="selected"';

-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -2870,10 +2870,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);

 

 

-function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {

 

     ob_start();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -2896,32 +2896,32 @@ 
         <label for="show_zip" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>

+                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

 

         </div>

     </li>

 

-    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >

+    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >

         <label for="zip_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>

+                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2939,7 +2939,7 @@ 
         <label for="map_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>

+                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2954,22 +2954,22 @@ 
         <label for="show_mapzoom" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>

+                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -2978,22 +2978,22 @@ 
         <label for="show_mapview" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>

+                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3003,7 +3003,7 @@ 
         <label for="mapview_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>

+                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3017,22 +3017,22 @@ 
         <label for="show_latlng" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>

+                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3041,17 +3041,17 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);

+add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);

 

 

-function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {

     ob_start();

     ?>

     <li>

         <label for="multi_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>

+                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3059,13 +3059,13 @@ 
             <select name="multi_display_type" id="multi_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

 

             <br/>

@@ -3076,10 +3076,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);

 

 

-function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {

 

     ob_start();

     $field_type = isset($field_info->field_type) ? $field_info->field_type : '';

@@ -3088,11 +3088,11 @@ 
         <label for="option_values" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>

+                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>

                 <br/>

-                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>

+                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>

                     <br/>

-                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>

+                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>

                     <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>

                         <br/>

                         <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>

@@ -3115,12 +3115,12 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);

 

 

-function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {

     ob_start();

     $extra = array();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -3131,7 +3131,7 @@ 
         <label for="date_format" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select the date format.', 'geodirectory');?>

+                <?php _e('Select the date format.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap" style="overflow:inherit;">

@@ -3151,16 +3151,16 @@ 
              * @since 1.6.5

              * @param array $date_formats The PHP date format array.

              */

-            $date_formats = apply_filters('geodir_date_formats',$date_formats);

+            $date_formats = apply_filters('geodir_date_formats', $date_formats);

             ?>

             <select name="extra[date_format]" id="date_format">

                 <?php

-                foreach($date_formats as $format){

+                foreach ($date_formats as $format) {

                     $selected = '';

-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){

+                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {

                         $selected = "selected='selected'";

                     }

-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

+                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";

                 }

                 ?>

             </select>

@@ -3172,10 +3172,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);

+add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);

 

 

-function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {

     ob_start();

     $allowed_file_types = geodir_allowed_mime_types();

 

@@ -3186,16 +3186,16 @@ 
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>

+                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">

-                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>

-                <?php foreach ( $allowed_file_types as $format => $types ) { ?>

-                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">

-                        <?php foreach ( $types as $ext => $type ) { ?>

-                            <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>

+                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>

+                <?php foreach ($allowed_file_types as $format => $types) { ?>

+                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">

+                        <?php foreach ($types as $ext => $type) { ?>

+                            <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option>

                         <?php } ?>

                     </optgroup>

                 <?php } ?>

@@ -3207,11 +3207,11 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);

+add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);

 

-function geodir_default_custom_fields($post_type='gd_place',$package_id=''){

+function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {

     $fields = array();

-    $package = ($package_id=='') ? '' : array($package_id);

+    $package = ($package_id == '') ? '' : array($package_id);

 

     $fields[] = array('listing_type' => $post_type,

                       'data_type' => 'VARCHAR',

geodirectory-admin/admin_functions.php

Spacing +917 added lines, -917 removed lines

@@ -46,31 +46,31 @@ 
     function geodir_admin_styles()

     {

 

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rtl-style');

 

     }

@@ -89,7 +89,7 @@ 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -108,60 +108,60 @@ 
         

         wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-choose-ajax');

 

         if (isset($_REQUEST['listing_type'])) {

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

         }

 

         wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);

 

         if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

+            $map_lang = "&language=".geodir_get_map_default_language();

+            $map_key = "&key=".geodir_get_map_api_key();

             /** This filter is documented in geodirectory_template_tags.php */

             $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+            wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         }

         

         if ($geodir_map_name == 'osm') {

             // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-geo-script');

         }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+        wp_enqueue_script('jquery-ui-autocomplete');

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodir-on-document-load');

 

 

@@ -169,7 +169,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -223,7 +223,7 @@ 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -231,10 +231,10 @@ 
 

         $screen = get_current_screen();

         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');

         }

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));

         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

     }

@@ -257,7 +257,7 @@ 
 

         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

     }

@@ -291,7 +291,7 @@ 
                 $geodir_menu_order[] = 'separator-geodirectory';

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -334,8 +334,8 @@ 
 {

     if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {

         echo '<div id="message" class="updated fade">

-                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

+                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>

+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>

                 </div>';

 

     }

@@ -343,7 +343,7 @@ 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

         switch ($_REQUEST['msg']) {

             case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';

                 flush_rewrite_rules(false);

 

                 break;

@@ -351,30 +351,30 @@ 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+			    	echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';

 				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {

         $need_map_key = true;

     }

 

     if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';

     }

 

     if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

 

     }

 

     if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';

 

     }

 

@@ -394,18 +394,18 @@ 
 function geodir_handle_option_form_submit($current_tab)

 {

     global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $current_tab . '_array.php');

+        include_once('option-pages/'.$current_tab.'_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -438,13 +438,13 @@ 
          * @param string $current_tab The current settings tab name.

          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

          */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);

 

         flush_rewrite_rules(false);

 

         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');

 

         wp_redirect($redirect_url);

         exit();

@@ -454,7 +454,7 @@ 
 }

 

 

-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {

+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {

     /**

      * GeoDirectory dummy data installation.

      *

@@ -470,18 +470,18 @@ 
         global $wpdb, $plugin_prefix;

 

         if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

         } else {

 

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

+            $geodir_url = admin_url().'admin.php?page=geodirectory&tab=general_settings&active_tab=';

 

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");

 

             if ($post_counts > 0) {

                 $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.SAMPLE_DATA_SHOW_MSG.'</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\''.$nonce.'\',\''.$post_type.'\')" href="javascript:void(0);" redirect_to="'.$geodir_url.'"  >'.DELETE_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_DELETE_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

             } else {

                 $options_list = '';

                 for ($option = 1; $option <= 30; $option++) {

@@ -489,13 +489,13 @@ 
                     if ($option == 10)

                         $selected = 'selected="selected"';

 

-                    $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

+                    $options_list .= '<option '.$selected.' value="'.$option.'">'.$option.'</option>';

                 }

 

                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.AUTO_INSATALL_MSG.'</b><br /><select class="selected_sample_data">'.$options_list.'</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\''.$nonce.'\',\''.$post_type.'\')"   redirect_to="'.$geodir_url.'" >'.INSERT_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_IMPORT_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

 

             }

             echo $dummy_msg;

@@ -509,7 +509,7 @@ 
             ?>

             <script type="text/javascript">

                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';

+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';

                 var bound_lat_lng;

                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];

                 var lat = <?php echo $city_latitude; ?>;

@@ -539,7 +539,7 @@ 
                                     return x.replace(" ", '');

                                 }); // remove spaces from lat/lon

                             } else {

-                                alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                                alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                             }

                         });

                 } else if (window.gdMaps == 'osm') {

@@ -564,7 +564,7 @@ 
                     var total_dummy_post_count = jQuery('#sub_' + active_tab).find('.selected_sample_data').val();

 

                     if (id == 'geodir_dummy_delete') {

-                        if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {

+                        if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {

                             jQuery('#sub_' + active_tab).find('.geodir_auto_install').hide();

                             jQuery('#sub_' + active_tab).find('.geodir_show_progress').show();

                             jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&_wpnonce=' + nonce,

@@ -585,7 +585,7 @@ 
                         var post_url = '<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce;

                         

                         jQuery.post( post_url, function (data) {

-                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');

+                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');

                             

                             dummy_post_index++;

                             

@@ -626,7 +626,7 @@ 
      * @package GeoDirectory

      */

     include_once('place_dummy_post.php');

-    delete_transient( 'cached_dummy_images' );

+    delete_transient('cached_dummy_images');

 

 }

 

@@ -643,7 +643,7 @@ 
     global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 

 

     foreach ($post_ids as $post_ids_obj) {

@@ -651,7 +651,7 @@ 
     }

 

     //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $wpdb->get_results("DELETE FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -689,14 +689,14 @@ 
 

 

                     if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                     else

                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                     $catname = str_replace(' ', '_', $catname);

-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                     if (empty($uploaded['error'])) {

                         $new_path = $uploaded['file'];

@@ -706,7 +706,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                     $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),

                         'post_mime_type' => $wp_filetype['type'],

                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                         'post_content' => '',

@@ -716,7 +716,7 @@ 
 

                     // you must first include the image.php file

                     // for the function wp_generate_attachment_metadata() to work

-                    require_once(ABSPATH . 'wp-admin/includes/image.php');

+                    require_once(ABSPATH.'wp-admin/includes/image.php');

                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                     wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -733,14 +733,14 @@ 
                 $last_catid = wp_insert_term($catname, 'gd_placecategory');

 

                 if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                 else

                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                 $catname = str_replace(' ', '_', $catname);

-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                 if (empty($uploaded['error'])) {

                     $new_path = $uploaded['file'];

@@ -750,7 +750,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                 $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),

                     'post_mime_type' => $wp_filetype['type'],

                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                     'post_content' => '',

@@ -762,7 +762,7 @@ 
 

                 // you must first include the image.php file

                 // for the function wp_generate_attachment_metadata() to work

-                require_once(ABSPATH . 'wp-admin/includes/image.php');

+                require_once(ABSPATH.'wp-admin/includes/image.php');

                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                 wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -804,18 +804,18 @@ 
 

         elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {

+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);

+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);

+                if (isset($_POST[$value['id'].'_crop'])) :

+                    update_option($value['id'].'_crop', 1);

                 else :

-                    update_option($value['id'] . '_crop', 0);

+                    update_option($value['id'].'_crop', 0);

                 endif;

             } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

+                update_option($value['id'].'_width', $value['std']);

+                update_option($value['id'].'_height', $value['std']);

+                update_option($value['id'].'_crop', 1);

             }

 

         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -857,12 +857,12 @@ 
         elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file

 

                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -890,7 +890,7 @@ 
                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -911,7 +911,7 @@ 
             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

                 $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);

             }

 

             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -981,8 +981,8 @@ 
 

             $listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+            $tabs[$geodir_post_type.'_fields_settings'] = array(

+                'label' => __(ucfirst($listing_slug).' Settings', 'geodirectory'),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

                         'label' => __('Custom Fields', 'geodirectory'),

@@ -1015,7 +1015,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

+    wp_enqueue_script('jquery-ui-progressbar');

     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

     return $tabs;

 }

@@ -1049,7 +1049,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

     return $tabs;

 }

 

@@ -1109,8 +1109,8 @@ 
                     _e('Unknown', 'geodirectory');

                 } else {

                     /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';

+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);

                 }

                 break;

 

@@ -1128,14 +1128,14 @@ 
                         $expire_class = 'expire_over';

                     }

                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

                 if (empty($expire_date))

                     echo __('Unknown', 'geodirectory');

                 /* If there is a expire_date, append 'days left' to the text string. */

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

             /* If displaying the 'categorys' column. */

@@ -1202,7 +1202,7 @@ 
 function geodir_post_information_save($post_id, $post) {

     global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

 

@@ -1270,7 +1270,7 @@ 
                     $tab_id = $value['id'];

 

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';

 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -1278,9 +1278,9 @@ 
                     } else {

                         echo '</div>';

                     }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

                 }

 

                 /**

@@ -1290,21 +1290,21 @@ 
                  *

                  * @since 1.0.0

                  */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

+                do_action('geodir_settings_'.sanitize_title($value['id']));

                 break;

 

             case 'no_tabs':

 

                 echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

 

                 break;

 

             case 'sectionstart':

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';

                 if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                    echo '<h3>'.$value['name'].$desc.'</h3>';

                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -1312,8 +1312,8 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');

+                echo '<table class="form-table">'."\n\n";

 

                 break;

             case 'sectionend':

@@ -1324,7 +1324,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');

                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -1333,7 +1333,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');

                 break;

             case 'text':

                 ?>

@@ -1342,7 +1342,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1359,7 +1359,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1405,17 +1405,17 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1465,7 +1465,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1476,7 +1476,7 @@ 
                             } else {

                                 ?>

                                 <option

-                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

+                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>

                             <?php

                             }

                         }

@@ -1511,7 +1511,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -1593,7 +1593,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -1634,7 +1634,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -1663,7 +1663,7 @@ 
                                                                                            name="home_map_post_types[]"

                                                                                            id="<?php echo esc_attr($value['id']); ?>"

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo $post_types_obj->labels->singular_name; ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1721,12 +1721,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1746,9 +1746,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1793,7 +1793,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1810,7 +1810,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1819,7 +1819,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1842,7 +1842,7 @@ 
             case 'multi_select_countries' :

                 $countries = $geodirectory->countries->countries;

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1852,7 +1852,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1864,8 +1864,8 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+                $selections = (array) get_option($value['id']);

+                if (get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret')) {

                     ?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1876,20 +1876,20 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             ?>

                             <script>

                                 function gd_ga_popup() {

-                                    var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

+                                    var win = window.open("<?php echo $auth_url; ?>", "Google Analytics", "");

                                     var pollTimer = window.setInterval(function () {

                                         if (win.closed !== false) { // !== is required for compatibility with Opera

                                             window.clearInterval(pollTimer);

@@ -1911,7 +1911,7 @@ 
                             } else {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -1982,9 +1982,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -2070,7 +2070,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -2081,13 +2081,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -2126,10 +2126,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2141,7 +2141,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -2351,9 +2351,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2486,7 +2486,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2498,7 +2498,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2519,11 +2519,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

+    if (in_array($post_type, $post_types))

         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');

+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -2533,8 +2533,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+function geodir_import_export_tab($tabs) {

+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));

     return $tabs;

 }

 

@@ -2548,8 +2548,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2558,9 +2558,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2569,15 +2569,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';

 	}

-	wp_enqueue_script( 'jquery-ui-progressbar' );

+	wp_enqueue_script('jquery-ui-progressbar');

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -2599,49 +2599,49 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2653,21 +2653,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -2676,7 +2676,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2694,7 +2694,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2706,10 +2706,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2723,30 +2723,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2754,13 +2754,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

@@ -2773,21 +2773,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -2797,7 +2797,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2814,7 +2814,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2826,10 +2826,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2843,26 +2843,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2884,7 +2884,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -2903,7 +2903,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

             dataType: 'json',

             cache: false,

             success: function(data) {

@@ -2955,7 +2955,7 @@ 
 

         jQuery(cont).find('.filelist .file').remove();

         

-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

         jQuery('#gd-import-msg', cont).show();

         

         return false;

@@ -3014,7 +3014,7 @@ 
     jQuery.ajax({

         url: ajaxurl,

         type: "POST",

-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

         dataType : 'json',

         cache: false,

         success: function (data) {

@@ -3203,27 +3203,27 @@ 
 

     var gdMsg = '<p></p>';

     if ( processed > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

         msgParse = msgParse.replace("%s", processed);

         gdMsg += msgParse;

     }

 

     if ( updated > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", updated);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( created > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", created);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( skipped > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", skipped);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

@@ -3233,17 +3233,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -3251,7 +3251,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+        gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3415,9 +3415,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3426,7 +3426,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3451,11 +3451,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3486,7 +3486,7 @@ 
 

     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

         if (page < 2) {

-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

         }

@@ -3494,7 +3494,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,

+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3508,11 +3508,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3569,13 +3569,13 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

+    if (!function_exists('get_filesystem_method')) {

         require_once(ABSPATH."/wp-admin/includes/file.php");

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3588,7 +3588,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3623,7 +3623,7 @@ 
  * @package GeoDirectory

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

     } elseif (!defined('FTP_USER')) {

@@ -3660,64 +3660,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3728,36 +3728,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

-            if ( isset( $_REQUEST['_c'] ) ) {

+            if (isset($_REQUEST['_c'])) {

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3765,45 +3765,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3811,7 +3811,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3820,7 +3820,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3834,20 +3834,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3855,48 +3855,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3904,127 +3904,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4041,25 +4041,25 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

@@ -4067,9 +4067,9 @@ 
                     

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -4083,19 +4083,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             

@@ -4120,13 +4120,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

+            if ($task == 'import_cat') {

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -4137,7 +4137,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

@@ -4154,42 +4154,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -4207,24 +4207,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -4232,104 +4232,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -4351,34 +4351,34 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

                 //remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4387,9 +4387,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4426,78 +4426,78 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4505,7 +4505,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4516,43 +4516,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4560,29 +4560,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4603,15 +4603,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4619,9 +4619,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4629,19 +4629,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4649,28 +4649,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4682,7 +4682,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4692,7 +4692,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4730,14 +4730,14 @@ 
                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4745,18 +4745,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));

                                         } else {

                                             $gd_post['expire_date'] = 'Never';

                                         }

@@ -4765,7 +4765,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+                                $table = $plugin_prefix.$post_type.'_detail';

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4776,28 +4776,28 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {

                                         $gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

+                                        if (isset($gd_post['gd_franchise_lock'])) {

+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                            $gd_franchise_lock = trim($gd_franchise_lock);

+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);

                                         }

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

@@ -4806,34 +4806,34 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4841,61 +4841,61 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                            foreach ($attachment as $key => $val) {

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

                                         /*

                                         $menu_order = 1;

@@ -4912,13 +4912,13 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

                                 /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -4938,10 +4938,10 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

 

                 $json = array();

                 $json['processed'] = $processed_actual;

@@ -4952,9 +4952,9 @@ 
                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -4963,82 +4963,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -5052,24 +5052,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -5080,20 +5080,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -5108,35 +5108,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -5146,12 +5146,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -5165,7 +5165,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -5209,29 +5209,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -5261,36 +5261,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -5309,20 +5309,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5333,11 +5333,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -5348,7 +5348,7 @@ 
      * @param int $posts_count Post counts.

      * @param string $post_type Post type.

      */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);

 

     return $posts_count;

 }

@@ -5369,19 +5369,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5392,7 +5392,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

+		if ($post_type == 'gd_event') {

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5450,15 +5450,15 @@ 
 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -5479,28 +5479,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5508,7 +5508,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5516,47 +5516,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -5565,18 +5565,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -5588,7 +5588,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5609,12 +5609,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

             $csv_row[] = $post_info['post_date']; // post_date

@@ -5650,14 +5650,14 @@ 
 			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -5668,15 +5668,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5690,15 +5690,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5720,30 +5720,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5754,9 +5754,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5766,8 +5766,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5778,7 +5778,7 @@ 
      * @param object $results An object containing all post ids.

      * @param string $post_type Post type.

      */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+    return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

@@ -5796,24 +5796,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+        if (!empty($skip_statuses) && is_array($skip_statuses)) {

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

         /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5837,35 +5837,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5882,23 +5882,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5920,16 +5920,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {

+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -5939,15 +5939,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5966,10 +5966,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5985,8 +5985,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -5994,17 +5994,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -6022,14 +6022,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

+		if (!empty($contents) && is_array($contents)) {

+			return count($contents) - 1;

 		}

 	}

 	

@@ -6046,11 +6046,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -6129,14 +6129,14 @@ 
 	global $wpdb, $plugin_prefix;

 	

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

 		return true;

@@ -6162,7 +6162,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -6171,9 +6171,9 @@ 
 		

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -6182,14 +6182,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -6210,15 +6210,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -6244,10 +6244,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -6264,15 +6264,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -6282,13 +6282,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -6304,7 +6304,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -6314,7 +6314,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -6326,8 +6326,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -6343,11 +6343,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -6411,9 +6411,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6460,17 +6460,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6488,7 +6488,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6552,7 +6552,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6607,7 +6607,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -6619,7 +6619,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -6627,7 +6627,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -6642,20 +6642,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6679,7 +6679,7 @@ 
 		$default_language = $sitepress->get_default_language();

 		if ($current_language != 'all' && $current_language != $default_language) {

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

@@ -6694,7 +6694,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6704,7 +6704,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6744,16 +6744,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }