GeoDirectory / geodirectory

geodirectory-functions/map-functions/get_markers.php

Spacing +104 added lines, -104 removed lines

@@ -7,9 +7,9 @@ 
  */

 

 // Enable map cache if set

-if(get_option('geodir_enable_map_cache')){

-    add_filter('geodir_get_markers_cache','geodir_get_map_cache');

-    add_filter('geodir_markers_json','geodir_save_map_cache',10);

+if (get_option('geodir_enable_map_cache')) {

+    add_filter('geodir_get_markers_cache', 'geodir_get_map_cache');

+    add_filter('geodir_markers_json', 'geodir_save_map_cache', 10);

 }

 

 

@@ -21,10 +21,10 @@ 
  * @since 1.6.22

  * @return string

  */

-function geodir_get_map_cache($cache){

+function geodir_get_map_cache($cache) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $cache;

     }

 

@@ -43,29 +43,29 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

     $file_path = realpath(dirname(__FILE__))."/map-cache/";

-    $file = $file_path . $file_name . ".json";

+    $file = $file_path.$file_name.".json";

 

-    if(file_exists($file)){

+    if (file_exists($file)) {

         // do the cache delete stuff

         $cache_time = get_option('geodir_map_cache');

-        if(!$cache_time){

+        if (!$cache_time) {

             $cache_time = time();

             update_option('geodir_map_cache', $cache_time);

         }

 

-        if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

+        if ((time() - $cache_time) > 86400) { // delete the cache every 24 hours

             geodir_delete_map_cache();

         }

 

-        if(file_exists($file) && is_readable($file)){

+        if (file_exists($file) && is_readable($file)) {

             ob_start();

             readfile($file); // readfile is quicker then file get contents

             return ob_get_clean();

@@ -83,10 +83,10 @@ 
  * @since 1.6.22

  * @return mixed

  */

-function geodir_save_map_cache($map_json){

+function geodir_save_map_cache($map_json) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $map_json;

     }

 

@@ -105,10 +105,10 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

@@ -117,7 +117,7 @@ 
 

     global $wp_filesystem;

     if (empty($wp_filesystem)) {

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

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

         WP_Filesystem();

     }

     $wp_filesystem->put_contents(

@@ -138,7 +138,7 @@ 
     $gd_session->set('homemap_catlist_ptype', $gd_post_type);

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

     $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (bool)$_REQUEST['child_collapse'];

+    $child_collapse = (bool) $_REQUEST['child_collapse'];

     echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

     die;

 }

@@ -158,21 +158,21 @@ 
     global $wpdb, $plugin_prefix, $gd_session;

 

     if ($_REQUEST['m_id'] != '') {

-        $pid = (int)$_REQUEST['m_id'];

+        $pid = (int) $_REQUEST['m_id'];

     } else {

         echo __('No marker data found', 'geodirectory');

         exit;

     }

 

     if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

+        $post = (object) $gd_ses_listing;

         echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

     } else {

         $geodir_post_type = get_post_type($pid);

 

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

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

 

-        $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

+        $sql = $wpdb->prepare("SELECT * FROM ".$table." WHERE post_id = %d", array($pid));

 

         $postinfo = $wpdb->get_results($sql);

 

@@ -206,7 +206,7 @@ 
  */

 function get_markers() {

     

-    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

+    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes, $gd_session;

 

 

     /**

@@ -214,8 +214,8 @@ 
      *

      * @since 1.6.22

      */

-    $map_cache = apply_filters('geodir_get_markers_cache','');

-    if($map_cache){

+    $map_cache = apply_filters('geodir_get_markers_cache', '');

+    if ($map_cache) {

         return $map_cache;

         wp_die();

     }

@@ -230,7 +230,7 @@ 
     $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

     $map_cat_ids_array = array('0');

-    $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

+    $cat_find_array = array(" FIND_IN_SET(%d, pd.".$post_type."category)");

 

 

     $field_default_cat = '';

@@ -238,13 +238,13 @@ 
         $map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

         if (!empty($map_cat_arr)) {

-            $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

+            $field_default_cat .= "WHEN (default_category IN (".$map_cat_arr.")) THEN default_category ";

 

             $map_cat_ids_array = explode(',', $map_cat_arr);

             $cat_find_array = array();

             foreach ($map_cat_ids_array as $cat_id) {

-                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

-                $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

+                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `".$post_type."category`) > 0) THEN $cat_id ";

+                $cat_find_array[] = " FIND_IN_SET(%d, pd.".$post_type."category)";

                 $main_query_array[] = $cat_id;

             }

 

@@ -255,13 +255,13 @@ 
         $field_default_cat = '';

 

     if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+        $search .= "AND (".implode(' OR ', $cat_find_array).")";

 

     $main_query_array = $map_cat_ids_array;

   

     if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

         $search .= " AND p.post_title LIKE %s";

-        $main_query_array[] = "%" . $_REQUEST['search'] . "%";

+        $main_query_array[] = "%".$_REQUEST['search']."%";

     }

 

     /**

@@ -283,14 +283,14 @@ 
 

     $gd_posttype = '';

     if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {

-        $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

+        $table = $plugin_prefix.$_REQUEST['gd_posttype'].'_detail';

         $gd_posttype = " AND p.post_type = %s";

         $main_query_array[] = $_REQUEST['gd_posttype'];

 

     } else

-        $table = $plugin_prefix . 'gd_place_detail';

+        $table = $plugin_prefix.'gd_place_detail';

 

-    $join = ", " . $table . " AS pd ";

+    $join = ", ".$table." AS pd ";

 

     /**

 	 * Filter the SQL JOIN clause for the markers data

@@ -310,14 +310,14 @@ 
 	 */

 	$search = apply_filters('geodir_home_map_listing_where', $search);

     $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

-    $cat_type = $post_type . 'category';

+    $cat_type = $post_type.'category';

     if ($post_type == 'gd_event') {

         $event_select = ", pd.recurring_dates, pd.is_recurring";

     } else {

         $event_select = "";

     }

 

-    $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

+    $sql_select = 'SELECT pd.default_category, pd.'.$cat_type.', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude'.$event_select;

     /**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

@@ -337,7 +337,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

+    $catsql = $wpdb->prepare("$select $field_default_cat FROM ".$wpdb->posts." as p".$join." WHERE p.ID = pd.post_id AND p.post_status = 'publish' ".$search.$gd_posttype.$groupby, $main_query_array);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -387,7 +387,7 @@ 
         global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

 

         $today = strtotime(date_i18n('Y-m-d'));

-        $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

+        $show_dates = $post_type == 'gd_event' ? (int) get_option('geodir_event_infowindow_dates_count', 1) : 0;

         

         foreach ($catinfo as $catinfo_obj) {

             $post_title = $catinfo_obj->post_title;

@@ -403,29 +403,29 @@ 
                     $endtimes = '';

                     $astarttimes = array();

                     $aendtimes = array();

-                    if ( !isset( $recurring_data['repeat_type'] ) ) {

+                    if (!isset($recurring_data['repeat_type'])) {

                         $recurring_data['repeat_type'] = 'custom';

                     }

-                    $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

-                    $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false;

+                    $repeat_type = isset($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom

+                    $different_times = isset($recurring_data['different_times']) && !empty($recurring_data['different_times']) ? true : false;

         

                     $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

                     

-                    if ( !empty( $recurring_dates ) ) {

-                        if ( empty( $recurring_data['all_day'] ) ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                                $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+                    if (!empty($recurring_dates)) {

+                        if (empty($recurring_data['all_day'])) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                $astarttimes = isset($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                                $aendtimes = isset($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                             } else {

-                                $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                                $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                                $starttimes = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                                $endtimes = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                             }

                         }

                         

                         $e = 0;

-                        foreach( $recurring_dates as $key => $date ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

+                        foreach ($recurring_dates as $key => $date) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                if (!empty($astarttimes) && isset($astarttimes[$key])) {

                                     $starttimes = $astarttimes[$key];

                                     $endtimes = $aendtimes[$key];

                                 } else {

@@ -434,50 +434,50 @@ 
                                 }

                             }

                             

-                            $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

+                            $duration = isset($recurring_data['duration_x']) && (int) $recurring_data['duration_x'] > 0 ? (int) $recurring_data['duration_x'] : 1;

                             $duration--;

-                            $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

+                            $enddate = date_i18n('Y-m-d', strtotime($date.' + '.$duration.' day'));

                             

                             // Hide past dates

-                            if ( strtotime( $enddate ) < $today ) {

+                            if (strtotime($enddate) < $today) {

                                 continue;

                             }

                                     

-                            $sdate = strtotime( $date . ' ' . $starttimes );

-                            $edate = strtotime( $enddate . ' ' . $endtimes );

+                            $sdate = strtotime($date.' '.$starttimes);

+                            $edate = strtotime($enddate.' '.$endtimes);

                                         

-                            $start_date = date_i18n( $geodir_date_time_format, $sdate );

-                            $end_date = date_i18n( $geodir_date_time_format, $edate );

+                            $start_date = date_i18n($geodir_date_time_format, $sdate);

+                            $end_date = date_i18n($geodir_date_time_format, $edate);

                             

                             $same_day = false;

                             $full_day = false;

                             $same_datetime = false;

                             

-                            if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

+                            if ($starttimes == $endtimes && ($starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00')) {

                                 $full_day = true;

                             }

                             

-                            if ( $start_date == $end_date && $full_day ) {

+                            if ($start_date == $end_date && $full_day) {

                                 $same_datetime = true;

                             }

 

-                            $link_date = date_i18n( 'Y-m-d', $sdate );

-                            $title_date = date_i18n( $geodir_date_format, $sdate );

-                            if ( $full_day ) {

+                            $link_date = date_i18n('Y-m-d', $sdate);

+                            $title_date = date_i18n($geodir_date_format, $sdate);

+                            if ($full_day) {

                                 $start_date = $title_date;

-                                $end_date = date_i18n( $geodir_date_format, $edate );

+                                $end_date = date_i18n($geodir_date_format, $edate);

                             }

                             

-                            if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

+                            if (!$same_datetime && !$full_day && date_i18n('Y-m-d', $sdate) == date_i18n('Y-m-d', $edate)) {

                                 $same_day = true;

                                 

-                                $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

+                                $start_date .= ' - '.date_i18n($geodir_time_format, $edate);

                             }

                             

-                            $event_dates .= ' :: ' . $start_date;

+                            $event_dates .= ' :: '.$start_date;

                         

-                            if ( !$same_day && !$same_datetime ) {

-                                $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                            if (!$same_day && !$same_datetime) {

+                                $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                             }

                             

                             $e++;

@@ -488,67 +488,67 @@ 
                         }

                     }

                 } else {

-                    $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

-                    $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

-                    $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false;

-                    $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                    $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                    $start_date = isset($recurring_data['event_start']) ? $recurring_data['event_start'] : '';

+                    $end_date = isset($recurring_data['event_end']) ? $recurring_data['event_end'] : $start_date;

+                    $all_day = isset($recurring_data['all_day']) && !empty($recurring_data['all_day']) ? true : false;

+                    $starttime = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                    $endtime = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                 

-                    $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

-                    $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                    $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+                    $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

+                    $starttimes = isset($recurring_data['starttimes']) && !empty($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                    $endtimes = isset($recurring_data['endtimes']) && !empty($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                     

-                    if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

+                    if (!geodir_event_is_date($start_date) && !empty($event_recurring_dates)) {

                         $start_date = $event_recurring_dates[0];

                     }

                                 

-                    if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

+                    if (strtotime($end_date) < strtotime($start_date)) {

                         $end_date = $start_date;

                     }

                     

                     if ($end_date != '' && strtotime($end_date) >= $today) {

-                        if ( $starttime == '' && !empty( $starttimes ) ) {

+                        if ($starttime == '' && !empty($starttimes)) {

                             $starttime = $starttimes[0];

                             $endtime = $endtimes[0];

                         }

                         

                         $same_day = false;

                         $one_day = false;

-                        if ( $start_date == $end_date && $all_day ) {

+                        if ($start_date == $end_date && $all_day) {

                             $one_day = true;

                         }

 

-                        if ( $all_day ) {

-                            $start_datetime = strtotime( $start_date );

-                            $end_datetime = strtotime( $end_date );

+                        if ($all_day) {

+                            $start_datetime = strtotime($start_date);

+                            $end_datetime = strtotime($end_date);

                             

-                            $start_date = date_i18n( $geodir_date_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_format, $end_datetime );

-                            if ( $start_date == $end_date ) {

+                            $start_date = date_i18n($geodir_date_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_format, $end_datetime);

+                            if ($start_date == $end_date) {

                                 $one_day = true;

                             }

                         } else {

-                            if ( $start_date == $end_date && $starttime == $endtime ) {

-                                $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

+                            if ($start_date == $end_date && $starttime == $endtime) {

+                                $end_date = date_i18n('Y-m-d', strtotime($start_date.' '.$starttime.' +1 day'));

                                 $one_day = false;

                             }

-                            $start_datetime = strtotime( $start_date . ' ' . $starttime );

-                            $end_datetime = strtotime( $end_date . ' ' . $endtime );

+                            $start_datetime = strtotime($start_date.' '.$starttime);

+                            $end_datetime = strtotime($end_date.' '.$endtime);

                             

-                            $start_date = date_i18n( $geodir_date_time_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_time_format, $end_datetime );

+                            $start_date = date_i18n($geodir_date_time_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_time_format, $end_datetime);

                         }

 

-                        if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

+                        if (!$one_day && date_i18n('Y-m-d', $start_datetime) == date_i18n('Y-m-d', $end_datetime)) {

                             $same_day = true;

                             

-                            $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

+                            $start_date .= ' - '.date_i18n($geodir_time_format, $end_datetime);

                         }

                         

-                        $event_dates .= ' :: ' . $start_date;

+                        $event_dates .= ' :: '.$start_date;

                         

-                        if ( !$same_day && !$one_day ) {

-                            $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                        if (!$same_day && !$one_day) {

+                            $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                         }

                     }

                 }

@@ -564,8 +564,8 @@ 
             $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

 

             // if single cat lets just show that icon

-            if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

-                $default_cat = (int)$map_cat_ids_array[0];

+            if (is_array($map_cat_ids_array) && count($map_cat_ids_array) == 1) {

+                $default_cat = (int) $map_cat_ids_array[0];

             }

 

             $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

@@ -585,7 +585,7 @@ 
                 $icon_size = array('w' => 36, 'h' => 45);

             }

 

-            $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

+            $content_data[] = '{"id":"'.$catinfo_obj->post_id.'","t": "'.$title.'","lt": "'.$catinfo_obj->post_latitude.'","ln": "'.$catinfo_obj->post_longitude.'","mk_id":"'.$catinfo_obj->post_id.'_'.$default_cat.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"'.$mark_extra.'}';

             $post_ids[] = $catinfo_obj->post_id;

         }

     }

@@ -609,10 +609,10 @@ 
     $totalcount = count(array_unique($post_ids));

 

     if (!empty($cat_content_info)) {

-        $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

+        $map_json = '[{"totalcount":"'.$totalcount.'",'.substr(implode(',', $cat_content_info), 1).']';

     }

     else {

-        $map_json =  '[{"totalcount":"0"}]';

+        $map_json = '[{"totalcount":"0"}]';

     }

 

 

@@ -622,7 +622,7 @@ 
      * @since 1.6.22

      * @param string $map_json The JSON string of the map markers results.

      */

-    return apply_filters('geodir_markers_json',$map_json);

+    return apply_filters('geodir_markers_json', $map_json);

 }

 

 

geodirectory-functions/compatibility/Genesis.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
     if ($remove_class) {
         $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
-        if ( $new_class == 'content' ) {
+        if ($new_class == 'content') {
             $new_class = 'content-no-sidebar';
             $classes[] = 'full-width-content';
         }

geodirectory-functions/user_functions.php

Spacing +57 added lines, -57 removed lines

@@ -11,17 +11,17 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  * @return array User listing count for each post type.
  */
-function geodir_user_favourite_listing_count($user_id=false)
+function geodir_user_favourite_listing_count($user_id = false)
 {
     global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+    if (!$user_id) {$user_id = $current_user->ID; }
+    if (!$user_id) {return array(); }
 
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     $user_favorites = geodir_get_user_favourites($user_id);
@@ -29,10 +29,10 @@ 
 
     $user_listing = array();
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+        $user_favorites = "'".implode("','", $user_favorites)."'";
 
         foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
 
             if ($total_posts > 0) {
                 $user_listing[$ptype] = $total_posts;
@@ -49,22 +49,22 @@ 
  * @since 1.5.9
  * @package GeoDirectory
  */
-function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
     // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
-    $user_favourite = geodir_user_favourite_listing_count( $user_id );
+    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
+    $user_favourite = geodir_user_favourite_listing_count($user_id);
 
-    if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
+    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
         $favourite_links = $output_type == 'link' ? array() : '';
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
 
                 /**
                  * Filter favorite listing link.
@@ -74,54 +74,54 @@ 
                  * @param string $key Favorite listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
+                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
 
-                if ( $output_type == 'select' ) {
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
+                    if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
                         $selected = 'selected="selected"';
                     }
 
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $favourite_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($favourite_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Favorites', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Favorites", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $favourite_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $favourite_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $favourite_links);
             }
         }
     }
 }
 
-function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
-    $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
-    $user_listing = geodir_user_post_listing_count( $user_id );
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
+    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
+    $user_listing = geodir_user_post_listing_count($user_id);
 
-    if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
+    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
         $listing_links = $output_type == 'link' ? array() : '';
 
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
 
                 /**
                  * Filter my listing link.
@@ -131,32 +131,32 @@ 
                  * @param string $key My listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
-                if ( $output_type == 'select' ) {
+                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
+                    if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
                         $selected = 'selected="selected"';
                     }
 
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $listing_links[] = '<a href="'.$listing_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $listing_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($listing_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Listings', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Listings", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $listing_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $listing_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $listing_links);
             }
         }
     }
@@ -169,12 +169,12 @@ 
  * @since 1.6.24
  * @return mixed
  */
-function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
+function geodir_get_user_favourites($user_id = '') {
+    if (!$user_id) {$user_id = get_current_user_id(); }
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);

geodirectory-functions/helper_functions.php

Spacing +137 added lines, -137 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,20 +133,20 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -154,17 +154,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -178,7 +178,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -189,20 +189,20 @@ 
  * @since 1.5.16 Added WPML lang code to url.
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -210,17 +210,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -238,7 +238,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -258,7 +258,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -278,7 +278,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -309,7 +309,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -319,8 +319,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -462,7 +462,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -480,10 +480,10 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /*
@@ -493,7 +493,7 @@ 
  * @param string $php_format The PHP date format.
  * @return string The jQuery format date string.
  */
-function geodir_date_format_php_to_jqueryui( $php_format ) {
+function geodir_date_format_php_to_jqueryui($php_format) {
 	$symbols = array(
 		// Day
 		'd' => 'dd',
@@ -533,27 +533,27 @@ 
 	$jqueryui_format = "";
 	$escaping = false;
 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
+	for ($i = 0; $i < strlen($php_format); $i++) {
 		$char = $php_format[$i];
 
 		// PHP date format escaping character
-		if ( $char === '\\' ) {
+		if ($char === '\\') {
 			$i++;
 
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= $php_format[$i];
 			} else {
-				$jqueryui_format .= '\'' . $php_format[$i];
+				$jqueryui_format .= '\''.$php_format[$i];
 			}
 
 			$escaping = true;
 		} else {
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= "'";
 				$escaping = false;
 			}
 
-			if ( isset( $symbols[$char] ) ) {
+			if (isset($symbols[$char])) {
 				$jqueryui_format .= $symbols[$char];
 			} else {
 				$jqueryui_format .= $char;
@@ -592,7 +592,7 @@ 
 		'December',
 	);
 
-	$non_english_long_months  = array(
+	$non_english_long_months = array(
 		__('January'),
 		__('February'),
 		__('March'),
@@ -606,10 +606,10 @@ 
 		__('November'),
 		__('December'),
 	);
-	$date = str_replace($non_english_long_months,$english_long_months,$date,$count);
+	$date = str_replace($non_english_long_months, $english_long_months, $date, $count);
     
-	if ( !empty( $wp_locale ) && empty($count) ) {
-		$date = str_replace( array_values( $wp_locale->month_genitive ), $english_long_months, $date );
+	if (!empty($wp_locale) && empty($count)) {
+		$date = str_replace(array_values($wp_locale->month_genitive), $english_long_months, $date);
 	}
 
 	$english_short_months = array(
@@ -628,21 +628,21 @@ 
 	);
 
 	$non_english_short_months = array(
-		' '._x( 'Jan', 'January abbreviation' ).' ',
-		' '._x( 'Feb', 'February abbreviation' ).' ',
-		' '._x( 'Mar', 'March abbreviation' ).' ',
-		' '._x( 'Apr', 'April abbreviation' ).' ',
-		' '._x( 'May', 'May abbreviation' ).' ',
-		' '._x( 'Jun', 'June abbreviation' ).' ',
-		' '._x( 'Jul', 'July abbreviation' ).' ',
-		' '._x( 'Aug', 'August abbreviation' ).' ',
-		' '._x( 'Sep', 'September abbreviation' ).' ',
-		' '._x( 'Oct', 'October abbreviation' ).' ',
-		' '._x( 'Nov', 'November abbreviation' ).' ',
-		' '._x( 'Dec', 'December abbreviation' ).' ',
+		' '._x('Jan', 'January abbreviation').' ',
+		' '._x('Feb', 'February abbreviation').' ',
+		' '._x('Mar', 'March abbreviation').' ',
+		' '._x('Apr', 'April abbreviation').' ',
+		' '._x('May', 'May abbreviation').' ',
+		' '._x('Jun', 'June abbreviation').' ',
+		' '._x('Jul', 'July abbreviation').' ',
+		' '._x('Aug', 'August abbreviation').' ',
+		' '._x('Sep', 'September abbreviation').' ',
+		' '._x('Oct', 'October abbreviation').' ',
+		' '._x('Nov', 'November abbreviation').' ',
+		' '._x('Dec', 'December abbreviation').' ',
 	);
 
-	$date = str_replace($non_english_short_months,$english_short_months,$date);
+	$date = str_replace($non_english_short_months, $english_short_months, $date);
 
 
 	return $date;
@@ -660,30 +660,30 @@ 
  * @param bool $locale True to retrieve the date in localized format. Default false.
  * @return string The formatted date.
  */
-function geodir_date( $date_input, $date_to, $date_from = '', $locale = false ) {
-    if ( empty( $date_input ) || empty( $date_to ) ) {
+function geodir_date($date_input, $date_to, $date_from = '', $locale = false) {
+    if (empty($date_input) || empty($date_to)) {
         return NULL;
     }
     
-    $date_input = geodir_maybe_untranslate_date( $date_input );
+    $date_input = geodir_maybe_untranslate_date($date_input);
     
     $timestamp = 0;
-    if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) {
-        $datetime = date_create_from_format( $date_from, $date_input );
-        if ( !empty( $datetime ) ) {
+    if (!empty($date_from) && function_exists('date_create_from_format')) {
+        $datetime = date_create_from_format($date_from, $date_input);
+        if (!empty($datetime)) {
             $timestamp = $datetime->getTimestamp();
         }
     }
     
-    if ( empty( $timestamp ) ) {
-        $date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input;
-        $timestamp = strtotime( $date );
+    if (empty($timestamp)) {
+        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+        $timestamp = strtotime($date);
     }
     
-    $date = date_i18n( $date_to, $timestamp );
+    $date = date_i18n($date_to, $timestamp);
     
-    if ( !$locale ) {
-        $date = geodir_maybe_untranslate_date( $date );
+    if (!$locale) {
+        $date = geodir_maybe_untranslate_date($date);
     }
     
     /**
@@ -698,7 +698,7 @@ 
      * @param string $date_from The source date format.
      * @param bool $locale True to retrieve the date in localized format.
      */
-    return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale );
+    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from, $locale);
 }
 
 /**
@@ -723,7 +723,7 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
+    if (!(int) $length > 0) {
         return $text;
     }
     $default = array(
@@ -785,7 +785,7 @@ 
         $length = $truncateLength;
 
         foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
+            $suffix .= '</'.$tag.'>';
         }
     } else {
         if (geodir_strlen($text, $options) <= $length) {
@@ -807,7 +807,7 @@ 
         }
     }
 
-    return $prefix . $result . $suffix;
+    return $prefix.$result.$suffix;
 }
 
 /**
@@ -844,7 +844,7 @@ 
     $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
     $replace = preg_replace_callback(
         $pattern,
-        function ($match) use ($strlen) {
+        function($match) use ($strlen) {
             $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
 
             return str_repeat(' ', $strlen($utf8, 'UTF-8'));
@@ -905,7 +905,7 @@ 
     }
 
     if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
+        return (string) $substr($text, $start, $length);
     }
 
     $totalOffset = 0;
@@ -930,7 +930,7 @@ 
 
         $len = geodir_strlen($part, $options);
         if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) {
                 // Entities cannot be passed substr.
                 continue;
             }
@@ -976,39 +976,39 @@ 
     return '';
 }
 
-function geodir_tool_restore_cpt_from_taxonomies(){
+function geodir_tool_restore_cpt_from_taxonomies() {
 
 	$cpts = get_option('geodir_post_types');
 
-	if(!empty($cpts)){return;}
+	if (!empty($cpts)) {return; }
 
 	$taxonomies = get_option('geodir_taxonomies');
 
-	if(empty($taxonomies)){return;}
+	if (empty($taxonomies)) {return; }
 
 	$cpts = array();
 
-	foreach($taxonomies as $key => $val){
+	foreach ($taxonomies as $key => $val) {
 
-		if(strpos($val['listing_slug'], '/') === false) {
-			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']);
+		if (strpos($val['listing_slug'], '/') === false) {
+			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']);
 		}
 
 	}
 
-	if(empty($cpts)){return;}
+	if (empty($cpts)) {return; }
 
 
 	$cpts_restore = $cpts;
 
-	foreach($cpts as $cpt){
+	foreach ($cpts as $cpt) {
 
 
-		$is_custom = $cpt['cpt']=='gd_place' ? 0 : 1;
+		$is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1;
 
-		$cpts_restore[$cpt['cpt']] = array (
+		$cpts_restore[$cpt['cpt']] = array(
 				'labels' =>
-					array (
+					array(
 						'name' => $cpt['slug'],
 						'singular_name' => $cpt['slug'],
 						'add_new' => 'Add New',
@@ -1036,14 +1036,14 @@ 
 				'public' => true,
 				'query_var' => true,
 				'rewrite' =>
-					array (
+					array(
 						'slug' => $cpt['slug'],
 						'with_front' => false,
 						'hierarchical' => true,
 						'feeds' => true,
 					),
 				'supports' =>
-					array (
+					array(
 						0 => 'title',
 						1 => 'editor',
 						2 => 'author',
@@ -1053,14 +1053,14 @@ 
 						6 => 'comments',
 					),
 				'taxonomies' =>
-					array (
+					array(
 						0 => $cpt['cpt'].'category',
 						1 => $cpt['cpt'].'_tags',
 					),
 				'is_custom' => $is_custom,
 				'listing_order' => '1',
 				'seo' =>
-					array (
+					array(
 						'meta_keyword' => '',
 						'meta_description' => '',
 					),
@@ -1072,7 +1072,7 @@ 
 	}
 
 
-	update_option('geodir_post_types',$cpts_restore);
+	update_option('geodir_post_types', $cpts_restore);
 
 }
 
@@ -1090,12 +1090,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function geodir_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return geodir_utf8_substr($str, $start, $width, $encoding).$trimmaker;
 }
 
 /**
@@ -1108,12 +1108,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function geodir_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
 /**
@@ -1128,12 +1128,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -1148,12 +1148,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -1169,16 +1169,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
+function geodir_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, geodir_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -1191,12 +1191,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-	if ( function_exists( 'mb_strwidth' ) ) {
-		return mb_strwidth( $str, $encoding );
+function geodir_utf8_strwidth($str, $encoding = 'UTF-8') {
+	if (function_exists('mb_strwidth')) {
+		return mb_strwidth($str, $encoding);
 	}
 
-	return geodir_utf8_strlen( $str, $encoding );
+	return geodir_utf8_strlen($str, $encoding);
 }
 
 /**
@@ -1210,21 +1210,21 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The resulting string.
  */
-function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function geodir_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = geodir_strtoupper(geodir_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = geodir_strtolower(geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding);
         }
         
-        return $first_letter . $str_end;
+        return $first_letter.$str_end;
     }
 
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
 function geodir_total_listings_count($post_type = false)
@@ -1234,13 +1234,13 @@ 
 	$count = 0;
 	
 	if ($post_type) {
-		$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail");
+		$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail");
 	} else {
 		$all_postypes = geodir_get_posttypes();
 
 		if (!empty($all_postypes)) {
 			foreach ($all_postypes as $key) {
-				$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail");
+				$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail");
 			}
 		}	
 	}

geodirectory-functions/custom_field_html.php

Spacing +124 added lines, -124 removed lines

@@ -39,12 +39,12 @@ 
 $cf = (isset($cf_arr[$field_type_key])) ? $cf_arr[$field_type_key] : '';

 

 

-if(isset($field_info->extra_fields)){$extra_fields = $field_info->extra_fields;}

+if (isset($field_info->extra_fields)) {$extra_fields = $field_info->extra_fields; }

 $field_info = stripslashes_deep($field_info); // strip slashes from labels

-if(isset($field_info->extra_fields)){$field_info->extra_fields = $extra_fields;}

+if (isset($field_info->extra_fields)) {$field_info->extra_fields = $extra_fields; }

 

 

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

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

 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

@@ -69,15 +69,15 @@ 
 

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

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

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

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

     $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';

-}else{

+} else {

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

 }

 

-if(isset($cf['name']) && $cf['name']){

+if (isset($cf['name']) && $cf['name']) {

     $field_type_name = $cf['name'];

-}else{

+} else {

     $field_type_name = $field_type;

 }

 

@@ -92,7 +92,7 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')" >

         <?php

 

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

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

         ?>

 

         <?php if (!$default): ?>

@@ -105,12 +105,12 @@ 
             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

             <b style="cursor:pointer;"

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

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

         <?php

         } else {echo $field_icon;

             ?>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(' '.$field_admin_title.' ('.$field_type_name.')'); ?></b>

         <?php

         }

         ?>

@@ -133,43 +133,43 @@ 
         } ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

-        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>

-        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : '';?>" />

+        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : ''; ?>" /><?php // show in sidebar value?>

+        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : ''; ?>" />

 

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

 

             <?php

 

             // data_type

-            if(has_filter("geodir_cfa_data_type_{$field_type}")){

+            if (has_filter("geodir_cfa_data_type_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_data_type_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['data_type'];

                 }

                 ?>

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

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

             <?php

             }

 

 

             // admin_title

-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['admin_title'];

                 }

                 ?>

@@ -182,7 +182,7 @@ 
                     </label>

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

                         <input type="text" name="admin_title" id="admin_title"

-                               value="<?php echo $value;?>"/>

+                               value="<?php echo $value; ?>"/>

                     </div>

                 </li>

                 <?php

@@ -190,15 +190,15 @@ 
 

 

             // site_title

-            if(has_filter("geodir_cfa_site_title_{$field_type}")){

+            if (has_filter("geodir_cfa_site_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_site_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['site_title'];

                 }

                 ?>

@@ -218,15 +218,15 @@ 
 

 

             // admin_desc

-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_desc_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_desc_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['admin_desc'];

                 }

                 ?>

@@ -237,7 +237,7 @@ 
                         </div>

                     </label>

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

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

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

                     </div>

                 </li>

                 <?php

@@ -246,26 +246,26 @@ 
 

 

             // htmlvar_name

-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

+            if (has_filter("geodir_cfa_htmlvar_name_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['htmlvar_name'];

                 }

                 ?>

                 <li>

-                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>

                         </div>

                     </label>

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

-                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

+                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"

                                value="<?php if ($value) {

                                    echo preg_replace('/geodir_/', '', $value, 1);

                                }?>" <?php if ($default) {

@@ -278,15 +278,15 @@ 
 

 

             // is_active

-            if(has_filter("geodir_cfa_is_active_{$field_type}")){

+            if (has_filter("geodir_cfa_is_active_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_active_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['is_active'];

                 }

                 ?>

@@ -298,17 +298,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>

                 </li>

@@ -317,15 +317,15 @@ 
 

 

             // for_admin_use

-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

+            if (has_filter("geodir_cfa_for_admin_use_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['for_admin_use'];

                 }

                 ?>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

@@ -356,20 +356,20 @@ 
 

 

             // default_value

-            if(has_filter("geodir_cfa_default_value_{$field_type}")){

+            if (has_filter("geodir_cfa_default_value_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_default_value_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['default_value'];

                 }

                 ?>

                 <li>

-                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

+                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

@@ -386,12 +386,12 @@ 
                         <?php if ($field_type == 'checkbox') { ?>

                             <select name="default_value" id="default_value">

                                 <option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>

-                                <option value="1" <?php selected(true, (int)$value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>

+                                <option value="1" <?php selected(true, (int) $value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>

                             </select>

                         <?php } else if ($field_type == 'email') { ?>

-                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } else { ?>

-                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } ?>

                     </div>

                 </li>

@@ -400,15 +400,15 @@ 
 

 

             // show_in

-            if(has_filter("geodir_cfa_show_in_{$field_type}")){

+            if (has_filter("geodir_cfa_show_in_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_show_in_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -441,18 +441,18 @@ 
                          * @param object $field_info The field being displayed info.

                          * @param string $field_info The type of field.

                          */

-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

+                        $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info, $field_type);

 

 

                         // remove some locations for some field types

 

                         // don't show new tab option for some types

-                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

-                        }else{

+                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

+                        } else {

                             unset($show_in_locations['[owntab]']);

                         }

 

-                        if(!$display_on_listing){

+                        if (!$display_on_listing) {

                             unset($show_in_locations['[listings]']);

                         }

 

@@ -466,17 +466,17 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

-                            $show_in_values = explode(',',$value);

+                            $show_in_values = explode(',', $value);

 

-                            foreach( $show_in_locations as $key => $val){

+                            foreach ($show_in_locations as $key => $val) {

                                 $selected = '';

 

-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+                                if (is_array($show_in_values) && in_array($key, $show_in_values)) {

                                     $selected = 'selected';

                                 }

 

                                 ?>

-                                <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

+                                <option  value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option>

                                 <?php

                             }

                             ?>

@@ -488,9 +488,9 @@ 
 

 

             // advanced_editor

-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

+            if (has_filter("geodir_cfa_advanced_editor_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

@@ -501,10 +501,10 @@ 
 

 

             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>

-            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels);} ?>"/>

+            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels); } ?>"/>

 

             <?php // we dont need to show the sort order ?>

-            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order);} ?>"/>

+            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order); } ?>"/>

 

 

 

@@ -557,15 +557,15 @@ 
             <?php

 

             // is_required

-            if(has_filter("geodir_cfa_is_required_{$field_type}")){

+            if (has_filter("geodir_cfa_is_required_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_required_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['is_required'];

                 }

                 ?>

@@ -578,17 +578,17 @@ 
 

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

 

@@ -598,19 +598,19 @@ 
             }

 

             // required_msg

-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){

+            if (has_filter("geodir_cfa_required_msg_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_required_msg_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['required_msg'];

                 }

                 ?>

-                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

+                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>

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

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

                         <div class="gdcf-tooltip">

@@ -627,31 +627,31 @@ 
 

 

             // required_msg

-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

+            if (has_filter("geodir_cfa_validation_pattern_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // extra_fields

-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

+            if (has_filter("geodir_cfa_extra_fields_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_extra_fields_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // field_icon

-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){

+            if (has_filter("geodir_cfa_field_icon_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_field_icon_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['field_icon'];

                 }

                 ?>

@@ -662,12 +662,12 @@ 
                     <label for="field_icon" class="gd-cf-tooltip-wrap">

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

                         <div class="gdcf-tooltip">

-                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>

+                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>

                         </div>

                     </label>

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

                         <input type="text" name="field_icon" id="field_icon"

-                               value="<?php echo $value;?>"/>

+                               value="<?php echo $value; ?>"/>

                     </div>

 

                 </li>

@@ -676,15 +676,15 @@ 
 

 

             // css_class

-            if(has_filter("geodir_cfa_css_class_{$field_type}")){

+            if (has_filter("geodir_cfa_css_class_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_css_class_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

                     $value = $cf['defaults']['css_class'];

                 }

                 ?>

@@ -693,8 +693,8 @@ 
                     <label for="css_class" class="gd-cf-tooltip-wrap">

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

                         <div class="gdcf-tooltip">

-                            <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

-                            <?php if($field_type=='multiselect'){_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory');}?>

+                            <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>

+                            <?php if ($field_type == 'multiselect') {_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory'); }?>

                         </div>

                     </label>

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

@@ -709,23 +709,23 @@ 
 

 

             // cat_sort

-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

+            if (has_filter("geodir_cfa_cat_sort_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_cat_sort_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

-                $hide_cat_sort  ='';

+                $hide_cat_sort = '';

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

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

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

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

                     $value = $cf['defaults']['cat_sort'];

-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

+                    $hide_cat_sort = ($value === false) ? "style='display:none;'" : '';

                 }

 

-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

+                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort'] === false) ? "style='display:none;'" : '';

                 ?>

-                <li <?php echo $hide_cat_sort ;?>>

+                <li <?php echo $hide_cat_sort; ?>>

                     <h3><?php

                         /**

                          * Filter the section title.

@@ -744,23 +744,23 @@ 
                     <label for="cat_sort" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>

+                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>

                         </div>

                     </label>

 

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

                             <?php if (!$value) {

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

@@ -787,7 +787,7 @@ 
                      * @param object $field_info The current fields info.

                      * @param array $cf The custom field settings

                      */

-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>

+                    do_action('geodir_advance_custom_fields', $field_info, $cf); ?>

 

 

                 <?php endswitch; ?>

@@ -799,10 +799,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_field('<?php echo esc_attr($result_str); ?>')"/>

                     <?php if (!$default): ?>

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

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

                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"

                                                             class="button"/></a>

                     <?php endif; ?>

geodirectory-functions/custom_fields_functions.php

Spacing +415 added lines, -415 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."`");

                     }

                 }

 

@@ -305,7 +305,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';

         }

 

@@ -318,12 +318,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)

             )

         );

@@ -335,7 +335,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)

                     )

                 );

@@ -353,7 +353,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'];

@@ -381,12 +381,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 = '';

@@ -427,9 +427,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 = '';

@@ -441,15 +441,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);

@@ -458,12 +458,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);

@@ -471,9 +471,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);

 

                                 }

 

@@ -483,36 +483,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);

@@ -520,24 +520,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);

@@ -545,128 +545,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);

                                 }

 

                             }

@@ -675,13 +675,13 @@ 
                         break;

 

                     case 'checkbox':

-                        $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL";

+                        $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TINYINT(1) NOT 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) {

+                        if ($alter_result === false) {

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

                         }

                         break;

@@ -692,30 +692,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']))

@@ -732,9 +732,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'];

@@ -748,24 +748,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;

@@ -781,7 +781,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -815,7 +815,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)

                     )

 

                 );

@@ -825,7 +825,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)

@@ -834,7 +834,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)));

 

 

                 /**

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

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -862,109 +862,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( 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);

                                 //$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( 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);

                                 //$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);

                             }

                         }

@@ -974,8 +974,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'";

                         }

 

@@ -1008,7 +1008,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'])) {

@@ -1016,9 +1016,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);

@@ -1033,9 +1033,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."'"; }*/

 

@@ -1050,9 +1050,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) {

@@ -1065,9 +1065,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) {

@@ -1079,22 +1079,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."'";

                             }

                         }

 

@@ -1116,7 +1116,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,

@@ -1149,7 +1149,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)

 

                     )

 

@@ -1161,7 +1161,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1194,7 +1194,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)

@@ -1216,7 +1216,7 @@ 
         global $post;

 

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

-            $_REQUEST['pid'] = (int)$_REQUEST['post'];

+            $_REQUEST['pid'] = (int) $_REQUEST['post'];

         }

     }

 

@@ -1239,7 +1239,7 @@ 
      * @param mixed $value Custom field value.

      * @param array $cf Custom field info.

      */

-    return apply_filters( 'geodir_get_cf_value', $value, $cf );

+    return apply_filters('geodir_get_cf_value', $value, $cf);

 }

 

 /**

@@ -1265,16 +1265,16 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

     foreach ($custom_fields as $key => $val) {

-        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}

+        if (isset($val['extra_fields'])) {$extra_fields = $val['extra_fields']; }

         $val = stripslashes_deep($val); // strip slashes from labels

-        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}

+        if (isset($val['extra_fields'])) {$val['extra_fields'] = $extra_fields; }

 

         $name = $val['name'];

         $type = $val['type'];

         $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;

         }

@@ -1299,11 +1299,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.

          *

@@ -1312,7 +1312,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);

 

 

 

@@ -1327,7 +1327,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);

 

     }

 

@@ -1353,7 +1353,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)

             )

         );

@@ -1368,14 +1368,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'];

     }

 

@@ -1420,14 +1420,14 @@ 
 

 

             foreach ($fields_info as $type) {

-                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+                if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }

                 $type = stripslashes_deep($type); // strip slashes

-                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+                if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }

                 $html = '';

                 $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.

@@ -1438,7 +1438,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();

 

@@ -1498,7 +1498,7 @@ 
          * @param string $fields_location The location the fields are being output.

          * @since 1.6.9

          */

-        return apply_filters('geodir_show_listing_info',$html,$fields_location);

+        return apply_filters('geodir_show_listing_info', $html, $fields_location);

 

     }

 }

@@ -1573,7 +1573,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);

@@ -1592,13 +1592,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];

@@ -1624,24 +1624,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))

@@ -1649,7 +1649,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

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

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

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1663,8 +1663,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;

             }

         }

 

@@ -1716,9 +1716,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;

     }

 

@@ -1733,20 +1733,20 @@ 
         // check ajax nonce

         $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 orientation 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);

         }

 

@@ -1776,9 +1776,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;

@@ -1802,9 +1802,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;

@@ -1822,12 +1822,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);

@@ -1859,7 +1859,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,admin_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,admin_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'

             );

@@ -1986,7 +1986,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)

@@ -2068,14 +2068,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)));

 

         }

 

@@ -2086,7 +2086,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,

@@ -2117,7 +2117,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,

@@ -2143,7 +2143,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -2166,7 +2166,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;

 

@@ -2189,12 +2189,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;

@@ -2230,18 +2230,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 class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>';

                 }

 

@@ -2251,40 +2251,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 form 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%;">

@@ -2294,7 +2294,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'); ?>

@@ -2304,24 +2304,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'); ?>

@@ -2331,14 +2331,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'); ?>

@@ -2349,7 +2349,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>

@@ -2359,7 +2359,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'); ?>

@@ -2369,24 +2369,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'); ?>

@@ -2396,13 +2396,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'); ?>

@@ -2413,7 +2413,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>

@@ -2438,14 +2438,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'); ?>

@@ -2469,7 +2469,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'); ?>

@@ -2479,17 +2479,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>

 

@@ -2510,10 +2510,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>

@@ -2548,7 +2548,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;

@@ -2671,13 +2671,13 @@ 
 }

 

 

-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();

 

     $dt_value = '';

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

         $dt_value  = esc_attr($field_info->data_type);

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

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

         $dt_value  = $cf['defaults']['data_type'];

     }

     ?>

@@ -2688,15 +2688,15 @@ 
             <select name="data_type" id="data_type"

                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">

                 <option

-                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {

+                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {

                     echo 'selected="selected"';

                 } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

                 <option

-                    value="INT" <?php if ($dt_value   == 'INT') {

+                    value="INT" <?php if ($dt_value == 'INT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

                 <option

-                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {

+                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

             </select>

@@ -2709,13 +2709,13 @@ 
     $value = '';

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

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

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

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

         $value = $cf['defaults']['decimal_point'];

     }

     ?>

 

     <li class="decimal-point-wrapper"

-        style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">

+        style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">

         <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>

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

             <select name="decimal_point" id="decimal_point">

@@ -2733,41 +2733,41 @@ 
     $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_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_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>

@@ -2798,16 +2798,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']);

     }

     ?>

@@ -2827,7 +2827,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']);

     }

     ?>

@@ -2848,10 +2848,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;

 

@@ -2876,7 +2876,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>

@@ -2887,7 +2887,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">

@@ -2895,19 +2895,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>

@@ -2916,10 +2916,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 != '') {

@@ -2942,32 +2942,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">

@@ -2985,7 +2985,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">

@@ -3000,22 +3000,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>

@@ -3024,22 +3024,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>

@@ -3049,7 +3049,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">

@@ -3063,22 +3063,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>

@@ -3087,17 +3087,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-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">

@@ -3105,13 +3105,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/>

@@ -3122,17 +3122,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-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();

 

     $value = '';

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

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

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

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

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

     }

 

@@ -3142,11 +3142,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>

@@ -3157,7 +3157,7 @@ 
         </label>

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

             <input type="text" name="option_values" id="option_values"

-                   value="<?php echo $value;?>"/>

+                   value="<?php echo $value; ?>"/>

             <br/>

 

         </div>

@@ -3167,12 +3167,12 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-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 != '') {

@@ -3183,7 +3183,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;">

@@ -3203,16 +3203,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>

@@ -3224,10 +3224,10 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-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();

 

@@ -3238,16 +3238,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 } ?>

@@ -3259,9 +3259,9 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-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_cfa_extra_fields_text($output,$result_str,$cf,$field_info){

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

     ob_start();

 

     $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

@@ -3275,15 +3275,15 @@ 
     $value = '';

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

     $value = esc_attr($extra_fields['is_price']);

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

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

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

     }

 

-    $show_price_extra = ($value==1) ? 1 : 0;

+    $show_price_extra = ($value == 1) ? 1 : 0;

 

-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

+    $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0;

     ?>

-    <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>

+    <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>

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

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

             <div class="gdcf-tooltip">

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

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

 

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

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

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

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

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

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

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

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3312,23 +3312,23 @@ 
     $value = '';

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

         $value = esc_attr($extra_fields['thousand_separator']);

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

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

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

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the thousand separator.', 'geodirectory'); ?>

             </div>

         </label>

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

                 <select name="extra[thousand_separator]" id="thousand_separator">

-                    <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>

-                    <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

-                    <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                    <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>

-                    <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>

+                    <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                    <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

+                    <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                    <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>

+                    <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>

                 </select>

         </div>

     </li>

@@ -3339,20 +3339,20 @@ 
     $value = '';

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

         $value = esc_attr($extra_fields['decimal_separator']);

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

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

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

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the decimal separator.', 'geodirectory'); ?>

             </div>

         </label>

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

             <select name="extra[decimal_separator]" id="decimal_separator">

-                <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3362,20 +3362,20 @@ 
     $value = '';

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

         $value = esc_attr($extra_fields['decimal_display']);

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

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

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

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>

             </div>

         </label>

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

             <select name="extra[decimal_display]" id="decimal_display">

-                <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

-                <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

+                <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

+                <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3385,12 +3385,12 @@ 
     $value = '';

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

         $value = esc_attr($extra_fields['currency_symbol']);

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

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

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

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol.', 'geodirectory'); ?>

             </div>

@@ -3406,20 +3406,20 @@ 
     $value = '';

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

         $value = esc_attr($extra_fields['currency_symbol_placement']);

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

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

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

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>

             </div>

         </label>

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

             <select name="extra[currency_symbol_placement]" id="currency_symbol_placement">

-                <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>

-                <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>

+                <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>

+                <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3430,11 +3430,11 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

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

+add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 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',

@@ -3607,7 +3607,7 @@ 
     return  $fields;

 }

 

-function geodir_currency_format_number($number='',$cf=''){

+function geodir_currency_format_number($number = '', $cf = '') {

 

     $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

 

@@ -3616,35 +3616,35 @@ 
     $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');

     $decimalpoint = '.';

 

-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

+    if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {

         $decimalpoint = ',';

     }

 

     $separator = ',';

 

-    if(isset($cs['thousand_separator'])){

-        if($cs['thousand_separator']=='comma'){$separator = ',';}

-        if($cs['thousand_separator']=='slash'){$separator = '\\';}

-        if($cs['thousand_separator']=='period'){$separator = '.';}

-        if($cs['thousand_separator']=='space'){$separator = ' ';}

-        if($cs['thousand_separator']=='none'){$separator = '';}

+    if (isset($cs['thousand_separator'])) {

+        if ($cs['thousand_separator'] == 'comma') {$separator = ','; }

+        if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }

+        if ($cs['thousand_separator'] == 'period') {$separator = '.'; }

+        if ($cs['thousand_separator'] == 'space') {$separator = ' '; }

+        if ($cs['thousand_separator'] == 'none') {$separator = ''; }

     }

 

     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

-    if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

+    if ($decimals > 0 && $decimal_display == 'if') {

+        if (is_int($number) || floor($number) == $number)

             $decimals = 0;

     }

 

-    $number = number_format($number,$decimals,$decimalpoint,$separator);

+    $number = number_format($number, $decimals, $decimalpoint, $separator);

 

 

 

-    if($currency_symbol_placement=='left'){

-        $number = $symbol . $number;

-    }else{

-        $number = $number . $symbol;

+    if ($currency_symbol_placement == 'left') {

+        $number = $symbol.$number;

+    } else {

+        $number = $number.$symbol;

     }

 

 

geodirectory-admin/admin_hooks_actions.php

Spacing +247 added lines, -247 removed lines

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+    geodir_admin_option_form($current_tab); // defined in admin template tags.php

 }

 

 

@@ -70,7 +70,7 @@ 
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');

 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');

 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php

-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);

+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);

 

 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');

 

@@ -99,7 +99,7 @@ 
         

         // Disable VC editor for GD post types.

         if (class_exists('Vc_Role_Access_Controller')) {

-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );

+            add_filter('vc_role_access_with_post_types_can', '__return_false', 100);

         }

     }

 

@@ -126,8 +126,8 @@ 
 add_action('admin_panel_init', 'geodir_admin_list_columns', 2);

 

 /* --- insert dummy post action ---*/

-add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);

-add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);

+add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);

+add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);

 

 

 /**

@@ -240,9 +240,9 @@ 
 

         // Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

         // no need of this box as all fields moved to main information box

         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

@@ -251,7 +251,7 @@ 
 

 }

 

-add_action('save_post', 'geodir_post_information_save',10,2);

+add_action('save_post', 'geodir_post_information_save', 10, 2);

 

 

 

@@ -278,10 +278,10 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');

 

                 }

             }

@@ -367,14 +367,14 @@ 
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');

 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

-function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_predefined($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('predefined');

     }

 }

 

-function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_custom($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('custom');

     }

 }

@@ -444,7 +444,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

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

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

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

@@ -455,7 +455,7 @@ 
 

             $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($val['htmlvar_name'], $listing_type, $val['field_type'])

                 )

             );

@@ -463,23 +463,23 @@ 
             $display = $check_html_variable ? ' style="display:none;"' : '';

            ?>

 

-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

+                if (isset($val['description']) && $val['description']) {

                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

                 }?>

 

-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

-                   title="<?php echo $val['site_title'];?>"

-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"

+                   title="<?php echo $val['site_title']; ?>"

+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

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

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

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

                         echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>';

-                    }else{

+                    } else {

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

                     }?>

-                    <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?>

+                    <?php echo (!empty($val['admin_title']) ? $val['admin_title'] : $val['site_title']); ?>

                 </a>

             </li>

 

@@ -507,7 +507,7 @@ 
     <?php 

         global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -532,14 +532,14 @@ 
  * @since 1.6.9

  * @package GeoDirectory

  */

-function geodir_custom_fields_custom($post_type=''){

+function geodir_custom_fields_custom($post_type = '') {

 

     $custom_fields = array();

 

     /**

      * @see `geodir_custom_fields`

      */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);

 }

 

 

@@ -550,7 +550,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -685,7 +685,7 @@ 
      * }

      * @param string $post_type The post type requested.

      */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);

 }

 

 /**

@@ -696,25 +696,25 @@ 
  * @param string $type The custom field type, predefined, custom or blank for default

  * @package GeoDirectory

  */

-function geodir_custom_available_fields($type='')

+function geodir_custom_available_fields($type = '')

 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

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

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

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

+        if ($type == 'predefined') {

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        }elseif ($type == 'custom') {

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else {

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>

+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>

                     </div>

                     <a id="gt-fieldset"

                        class="gd-draggable-form-items gt-fieldset"

@@ -725,7 +725,7 @@ 
 

                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>

+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>

                     </a>

                 </li>

             </ul>

@@ -733,15 +733,15 @@ 
             <?php

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

         echo '<ul>';

-        foreach ( $cfs as $id => $cf ) {

+        foreach ($cfs as $id => $cf) {

             ?>

 

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+                if (isset($cf['description']) && $cf['description']) {

+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';

                 } ?>

 

                 <a id="gd-<?php echo $id; ?>"

@@ -751,10 +751,10 @@ 
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"

                    href="javascript:void(0);">

 

-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

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

-                        echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>';

+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

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

+                        echo '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';

                     } else {

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

                     } ?>

@@ -763,7 +763,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else {

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -791,7 +791,7 @@ 
     <ul class="core">

     <?php 

         global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -801,7 +801,7 @@ 
                 $field_type_key = $field->field_type_key;

                 $field_ins_upd = 'display';

 

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);

             }

         }

         ?></ul>

@@ -960,8 +960,8 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))

+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");

 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -990,7 +990,7 @@ 
             case 'diagnosis' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                    call_user_func('geodir_diagnose_' . $diagnose_this);

+                    call_user_func('geodir_diagnose_'.$diagnose_this);

 

                 }

                 exit();

@@ -999,7 +999,7 @@ 
             case 'diagnosis-fix' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

         }

@@ -1024,50 +1024,50 @@ 
 {

     global $wpdb;

     //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {

+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             }

@@ -1075,54 +1075,54 @@ 
         }

 

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";

                 }

 

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original

+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 }

             } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 }

             }

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             }

 

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

@@ -1136,11 +1136,11 @@ 
             delete_option('geodir_custom_posts_db_version');

             delete_option('geodir_reviewratings_db_version');

             delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";

         }

 

     } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";

     }

     return $filter_arr;

 }

@@ -1181,21 +1181,21 @@ 
     }

 

     if ($stepped_process) {

-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );

-        $posts = $wpdb->get_results( $sql );

+        $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);

+        $posts = $wpdb->get_results($sql);

 

         if (!empty($posts)) {

 

             foreach ($posts as $p) {

                 $p->post_type = $ptype;

-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                 if (empty($raw_tags)) {

                     $post_tags = '';

                 } else {

                     $post_tags = implode(",", $raw_tags);

                 }

-                $tablename = $plugin_prefix . $p->post_type . '_detail';

-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                $tablename = $plugin_prefix.$p->post_type.'_detail';

+                $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

             }

             if ($step >= $max_step) {

@@ -1211,23 +1211,23 @@ 
         if (!empty($all_postypes)) {

             foreach ($all_postypes as $key) {

                 // update each GD CPT

-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");

+                $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");

 

                 if (!empty($posts)) {

 

                     foreach ($posts as $p) {

                         $p->post_type = $key;

-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                         if (empty($raw_tags)) {

                             $post_tags = '';

                         } else {

                             $post_tags = implode(",", $raw_tags);

                         }

-                        $tablename = $plugin_prefix . $p->post_type . '_detail';

-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                        $tablename = $plugin_prefix.$p->post_type.'_detail';

+                        $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

                     }

-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+                    $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

                 }

 

             }

@@ -1238,14 +1238,14 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

 

     if ($stepped_process) {

-        $percent = ($step/$max_step) * 100;

+        $percent = ($step / $max_step) * 100;

         if ($output_str == 'done') {

             echo $output_str;

         } else {

@@ -1288,29 +1288,29 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));

 

                     if (empty($raw_cats)) {

                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {

+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);

+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

                         }

 

                         if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');

 

                         }

 

@@ -1320,14 +1320,14 @@ 
                     if (empty($raw_cats)) {

                         $post_cats = '';

                     } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

+                        $post_cats = ','.implode(",", $raw_cats).',';

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));

                 }

 

             }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

 

         }

 

@@ -1335,7 +1335,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1388,15 +1388,15 @@ 
     if (!empty($ver_arr)) {

         foreach ($ver_arr as $key => $val) {

             if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";

             } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";

             }

 

         }

 

         if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";

         }

 

     }

@@ -1433,43 +1433,43 @@ 
     $output_str = '';

 

     // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";

     }

 

     // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {

+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";

     }

 

 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1533,7 +1533,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1567,7 +1567,7 @@ 
     else {

         $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)

             )

         );

@@ -1613,18 +1613,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1638,18 +1638,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1664,18 +1664,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1689,18 +1689,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1714,18 +1714,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1739,18 +1739,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1764,18 +1764,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1784,13 +1784,13 @@ 
     /* Diagnose Location Page Ends */

     ////////////////////////////////

 

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);

     /**

      * This action is called at the end of the GD Tools page check function.

      *

      * @since 1.5.2

      */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);

 

     $output_str = $page_chk_arr['output_str'];

     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

@@ -1800,7 +1800,7 @@ 
             flush_rewrite_rules();

         }

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1828,10 +1828,10 @@ 
     $fix_button_txt = '';

 

     if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";

 		$info_div_class = "geodir_problem_info";

     } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";

 		$info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

@@ -1873,17 +1873,17 @@ 
     global $wpdb, $wp_query, $plugin_prefix;

 

     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';

         $clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';

         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

         $clauses['fields'] = $fields;

 

         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

+        $orderby = 'gd_expire '.$order;

         $clauses['orderby'] = $orderby;

     }

     return $clauses;

@@ -1926,7 +1926,7 @@ 
         global $current_user;

         $upload_dir = wp_upload_dir();

 

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';

         $handle = fopen($file, 'w');

 

         fwrite($handle, $input);

@@ -1971,7 +1971,7 @@ 
     $uploads_dir = $uploads['path'];

     $image_name_arr = explode('/', $filename);

     $filename = end($image_name_arr);

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

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

     $return = array();

     $return['file'] = $uploadedFile;

     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

@@ -1988,8 +1988,8 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

+                        if (is_array($data) && !empty($data)) {

+                            $file[] = '"'.implode('","', $data).'"';

                         }

                     }

                     fclose($handle);

@@ -2106,10 +2106,10 @@ 
                     $tag_arr = explode(',', $post_tags);

                 }

 

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database

 

                 $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {

                     $invalid_post_type++;

                     continue;

                 }

@@ -2135,7 +2135,7 @@ 
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {

                                 $submitdata = date('Y-m-d');

 

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));

                             } else {

                                 $gd_post_info['expire_date'] = 'Never';

                             }

@@ -2163,7 +2163,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -2181,8 +2181,8 @@ 
 					

 					// Default post status

 					$default_status = 'publish';

-					$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;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2226,7 +2226,7 @@ 
                     $payment_info = array();

                     $package_info = array();

 

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);

                     $package_id = '';

                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

                         $package_id = $gd_post_info['package_id'];

@@ -2236,7 +2236,7 @@ 
                         $payment_info['package_id'] = $package_info['pid'];

 

                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));

                         } else {

                             $payment_info['expire_date'] = 'Never';

                         }

@@ -2248,7 +2248,7 @@ 
 

                     $post_type = get_post_type($last_postid);

 

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

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

 

                     geodir_save_post_info($last_postid, $gd_post_info);

 

@@ -2269,7 +2269,7 @@ 
                             $attachment['post_id'] = $last_postid;

                             $attachment['title'] = $img_name_arr[0];

                             $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

+                            $attachment['file'] = $sub_dir.'/'.$image_name;

                             $attachment['mime_type'] = $uploaded_file_type;

                             $attachment['menu_order'] = $menu_order;

                             $attachment['is_featured'] = 0;

@@ -2278,15 +2278,15 @@ 
 

                             foreach ($attachment as $key => $val) {

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             if ($menu_order == 1) {

                                 $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));

                             }

                             $menu_order++;

                         }

@@ -2327,11 +2327,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for import/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2342,40 +2342,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

-add_action('save_post', 'geodir_update_location_prefix',10,2);

+add_action('save_post', 'geodir_update_location_prefix', 10, 2);

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

     $code = "code=".$_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

     $client_id = "&client_id=".get_option('geodir_ga_client_id');

     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2384,18 +2384,18 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error.": ".$parts->error_description; exit;

+        } else {

+            echo $error_msg." - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg." - #3"; exit;

 

     }

 }

@@ -2417,7 +2417,7 @@ 
 function geodir_uninstall_settings($general_settings) {

     $settings   = array();

     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));

     

     $plugins    = get_plugins();

     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

@@ -2429,7 +2429,7 @@ 
             if (in_array($plugin_name, $un_plugins)) {

                 $settings[] = array(

                     'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

+                    'id' => 'geodir_un_'.$plugin_name,

                     'name' => $data['Name'],

                     'desc' => __('Remove all data when deleted?', 'geodirectory'),

                     'std' => '0'

@@ -2463,7 +2463,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';

+    echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

@@ -2527,12 +2527,12 @@ 
 

 

     if ($delete) {

-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";

         ob_start();

         geodir_diagnose_version_clear();

         ob_end_clean();

-    }else{

-        $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";

+    } else {

+        $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";

     }

 

     if ($is_error_during_diagnose) {

@@ -2557,9 +2557,9 @@ 
  * @param object $row The post|taxonomy object.

  * @return array Filtered actions.

  */

-function geodir_disable_quick_edit( $actions = array(), $row = null ) {

-    if ( isset( $actions['inline hide-if-no-js'] ) ) {

-        unset( $actions['inline hide-if-no-js'] );

+function geodir_disable_quick_edit($actions = array(), $row = null) {

+    if (isset($actions['inline hide-if-no-js'])) {

+        unset($actions['inline hide-if-no-js']);

     }

 

     return $actions;

@@ -2578,26 +2578,26 @@ 
 function geodir_check_quick_edit() {

     global $pagenow, $current_screen, $gd_cpt_screen;

 

-    if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {

-        if ( empty( $gd_cpt_screen ) ) {

-            if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {

+    if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {

+        if (empty($gd_cpt_screen)) {

+            if (in_array($current_screen->post_type, geodir_get_posttypes())) {

                 $gd_cpt_screen = 'y';

             } else {

                 $gd_cpt_screen = 'n';

             }

         }

 

-        if ( $gd_cpt_screen == 'y' ) {

-            if ( $pagenow == 'edit.php' ) {

-                add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-                add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-            } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {

-                add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );

+        if ($gd_cpt_screen == 'y') {

+            if ($pagenow == 'edit.php') {

+                add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);

+                add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);

+            } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {

+                add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2);

             }

         }

     }

 }

-add_action( 'admin_head', 'geodir_check_quick_edit', 10 );

+add_action('admin_head', 'geodir_check_quick_edit', 10);

 

 /**

  * Filter the bulk actions for GD CPT.

@@ -2608,9 +2608,9 @@ 
  * @param array $actions An array of the available bulk actions.

  * @return array Filtered bulk actions.

  */

-function geodir_filter_bulk_actions( $actions ) {

-    if ( isset( $actions['edit'] ) ) {

-        unset( $actions['edit'] );

+function geodir_filter_bulk_actions($actions) {

+    if (isset($actions['edit'])) {

+        unset($actions['edit']);

     }

     

     return $actions;

geodirectory_template_actions.php

Spacing +188 added lines, -188 removed lines

@@ -283,7 +283,7 @@ 
 

     //php

     if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+        include_once('geodirectory-functions/compatibility/'.$tc['geodir_theme_compat_code'].'.php');

     }

 

     //geodir_full_page_class

@@ -453,13 +453,13 @@ 
 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -573,13 +573,13 @@ 
 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -677,7 +677,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -736,10 +736,10 @@ 
 

     $json = '{';

     $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

+    $json .= '"t": "'.$json_title.'",';

+    $json .= '"lt": "'.$post_latitude.'",';

+    $json .= '"ln": "'.$post_longitude.'",';

+    $json .= '"i":"'.$term_icon.'"';

     $json .= '}';

 

     $post->marker_json = $json;

@@ -755,14 +755,14 @@ 
         $post->default_category = '';

         $post->post_type = '';

     }

-	if (empty($post->default_category) && ! empty($post->post_default_category)) {

+	if (empty($post->default_category) && !empty($post->post_default_category)) {

 		$post->default_category = $post->post_default_category;

 	}

 	if (empty($post->post_type) && !empty($post->listing_type)) {

 		$post->post_type = $post->listing_type;

 	}

 	$post_type = $post->post_type;

-	$cat_taxonomy = $post_type . "category";

+	$cat_taxonomy = $post_type."category";

 	if (!empty($post_type) && empty($post->{$cat_taxonomy}) && !empty($post->post_category) && !empty($post->post_category[$cat_taxonomy])) {

 		$post->{$cat_taxonomy} = $post->post_category[$cat_taxonomy];

 	}

@@ -977,7 +977,7 @@ 
      * @param string $class The class to use. Default is 'entry-header'.

      */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.stripslashes(get_the_title()).'</h1></header>';

 }

 

 

@@ -1015,7 +1015,7 @@ 
     $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

     $image_limit = '';

     if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

-        $image_limit = (int)$package_info->image_limit;

+        $image_limit = (int) $package_info->image_limit;

     }

 

     if ($preview) {

@@ -1031,7 +1031,7 @@ 
 

         if (!empty($post_images)) {

             foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

+                if ($image_limit !== '' && ($slides + 1) > $image_limit) {

                      break;

                 }

                 if (!empty($image)) {

@@ -1040,7 +1040,7 @@ 
                     $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1052,9 +1052,9 @@ 
 

                         $image_title = isset($image->title) ? $image->title : '';

 

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                        $main_slides .= '<li><img src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:'.$spacer_height.'px;margin:0 auto;" />';

+                        $main_slides .= '<img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:400px;margin:0 auto;" /></li>';

+                        $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:48px;margin:0 auto;" /></li>';

                         $slides++;

                     }

                 }

@@ -1075,7 +1075,7 @@ 
 

         if (!empty($post_images)) {

             foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

+                if ($image_limit !== '' && ($slides + 1) > $image_limit) {

                      break;

                 }

                 if ($image->height >= 400) {

@@ -1084,9 +1084,9 @@ 
                     $spacer_height = ((400 - $image->height) / 2);

                 }

 

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $main_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

         }// endfore

@@ -1121,7 +1121,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1130,11 +1130,11 @@ 
 

     if ($preview && !$is_backend_preview) {

         $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

         $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

     } else {

         $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

     }

 //{	

     $post_type_info = get_post_type_object($post_type);

@@ -1142,7 +1142,7 @@ 
 

     if (!empty($post->post_tags)) {

 

-        if (taxonomy_exists($post_type . '_tags')):

+        if (taxonomy_exists($post_type.'_tags')):

             $links = array();

             $terms = array();

             // to limit post tags

@@ -1169,8 +1169,8 @@ 
                 $post_term = trim($post_term);

 

                 $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+                if ($insert_term = term_exists($post_term, $post_type.'_tags')) {

+                    $term = get_term_by('id', $insert_term['term_id'], $post_type.'_tags');

                 } else {

                     $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

                     $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

@@ -1180,10 +1180,10 @@ 
                     $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

                     if ($match_country || $match_region || $match_city) {

                         $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $insert_term = wp_insert_term($post_term, $post_type.'_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     }

                 }

 

@@ -1200,12 +1200,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

+                        $tag_link = "<a href='".esc_attr(get_term_link($term->term_id, $term->taxonomy))."'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1215,7 +1215,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+            $taxonomies[$post_type.'_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

         endif;

 

     }

@@ -1243,7 +1243,7 @@ 
                     $term = get_term_by('id', $post_term, $post_taxonomy);

 

                     if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+                        $term_link = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>$term->name</a>";

                         /**

                          * Filter the category name on the details page.

                          *

@@ -1251,7 +1251,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1269,7 +1269,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

 

     }

 

@@ -1282,14 +1282,14 @@ 
      * @param string $listing_label The post type label.

      * @param string $listing_label The post type label with ucwords function.

      */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+    $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));

 

     if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+        echo '<span class="geodir-category">'.$taxonomies[$post_taxonomy].'</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type.'_tags']))

+        echo '<span class="geodir-tags">'.$taxonomies[$post_type.'_tags'].'</span>';

 

     ?>

     </p><?php

@@ -1310,11 +1310,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

@@ -1329,7 +1329,7 @@ 
     } else {

         foreach ($post_reviews as $review) {

 

-            if($rating_value = geodir_get_commentoverall($review->comment_ID)){

+            if ($rating_value = geodir_get_commentoverall($review->comment_ID)) {

                 $reviews[] = array(

                     "@type" => "Review",

                     "author" => $review->comment_author,

@@ -1337,7 +1337,7 @@ 
                     "description" => $review->comment_content,

                     "reviewRating" => array(

                         "@type" => "Rating",

-                        "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                        "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                         "ratingValue" => $rating_value,

                         "worstRating" => "1"

                     )

@@ -1367,13 +1367,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1383,17 +1383,17 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

+    if (isset($post->default_category) && $post->default_category) {

         $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if ($cat_schema) {$schema_type = $cat_schema; }

+        if (!$cat_schema && $schema_type == 'LocalBusiness' && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "https://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_title;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1407,7 +1407,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1415,7 +1415,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1434,10 +1434,10 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+    echo '<script type="application/ld+json">'.json_encode($schema).'</script>';

 

 

     $uploads = wp_upload_dir();

@@ -1450,7 +1450,7 @@ 
      * @param string $facebook_og The open graph html to be filtered.

      * @param object $post The post object.

      */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+    echo apply_filters('geodir_details_facebook_og', $facebook_og, $post);

 

 

 

@@ -1473,9 +1473,9 @@ 
     ?>

     <div class="geodir-pos_navigation clearfix">

     <div

-        class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

+        class="geodir-post_left"><?php previous_post_link('%link', ''.__('Previous', 'geodirectory'), false) ?></div>

     <div

-        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory') . '', false) ?></div>

+        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory').'', false) ?></div>

     </div><?php

 }

 

@@ -1544,12 +1544,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

     if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+    $list_title = $add_string_in_title.__($post_type_info->labels->name, 'geodirectory');

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type, true);

@@ -1577,12 +1577,12 @@ 
         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term)) {

             $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                 $location_last_char = substr($location_name, -1);

                 $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

             } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

             }

         } else {

             if (count($taxonomy) > 1) {

@@ -1590,12 +1590,12 @@ 
 

                 if (!empty($current_term)) {

                     $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                         $location_last_char = substr($location_name, -1);

                         $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                        $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

                     } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                        $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

                     }

                 }

             }

@@ -1623,7 +1623,7 @@ 
                 $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_city."'";

         } else if ($gd_region != '') {

             if ($gd_region_actual != '') {

                 $gd_region = $gd_region_actual;

@@ -1633,7 +1633,7 @@ 
                 $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_region."'";

         } else if ($gd_country != '') {

             if ($gd_country_actual != '') {

                 $gd_country = $gd_country_actual;

@@ -1643,12 +1643,12 @@ 
                 $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_country."'";

         }

     }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

     }

     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

@@ -1658,26 +1658,26 @@ 
 

     $title = $list_title;

     $gd_page = '';

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+        $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

-        if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

+        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1691,16 +1691,16 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the listing page title.

          *

          * @since 1.0.0

          * @param string $list_title The title for the category page.

          */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', $title).'</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1719,16 +1719,16 @@ 
     $gd_post_type = geodir_get_current_posttype();

     if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+        $term_desc = term_description($current_term->term_id, $gd_post_type.'_tags');

         $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

         if ($term_desc && !$saved_data) {

             $saved_data = $term_desc;

         }

 

         // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        $filter_priority = has_filter('the_content', 'geodir_payments_the_content');

+        if (false !== $filter_priority) {

+            remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         /**

@@ -1742,14 +1742,14 @@ 
         $cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        if (false !== $filter_priority) {

+            add_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1799,13 +1799,13 @@ 
 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -2110,11 +2110,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

-    if(geodir_is_page('add-listing')){

+    if (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

-        if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2128,9 +2128,9 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">';

     echo $title;

     echo '</h1></header>';

 }

@@ -2144,7 +2144,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2179,7 +2179,7 @@ 
 

     if (isset($_REQUEST['backandedit'])) {

         global $post;

-        $post = (object)$gd_session->get('listing');

+        $post = (object) $gd_session->get('listing');

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2194,7 +2194,7 @@ 
         $thumb_img_arr = geodir_get_images($post->ID);

         if ($thumb_img_arr) {

             foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

+                $curImages .= $post_img->src.',';

             }

         }

 

@@ -2202,7 +2202,7 @@ 
         $title = $post->post_title;

         $desc = $post->post_content;

         $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type.'_tags', array('fields' => 'names')));

     } else {

         $listing_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -2213,20 +2213,20 @@ 
 

     $post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing', 'geodirectory');

     

     $package_info = array();

     $package_info = geodir_post_package_info($package_info, $post);

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>" method="post" enctype="multipart/form-data">

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?>

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

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

         <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

-            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/>

+            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/>

         <?php } if (isset($_REQUEST['backandedit'])) { ?>

-            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

+            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/>

         <?php

         } 

         /**

@@ -2238,7 +2238,7 @@ 
          */

         do_action('geodir_before_detail_fields');

         ?>

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

         <?php

         /**

          * Called at the top of the add listing page form for frontend.

@@ -2259,10 +2259,10 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+                echo apply_filters('geodir_add_listing_title_label', sprintf(__('%s Title', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         $show_editor = get_option('geodir_tiny_editor_on_add_listing');

@@ -2308,7 +2308,7 @@ 
         $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

         $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just before the description field.

              *

@@ -2321,7 +2321,7 @@ 
             $desc_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

+        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>">

             <label><?php

                 /**

                  * Filter the add listing page description input label.

@@ -2331,7 +2331,7 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+                echo apply_filters('geodir_add_listing_description_label', sprintf(__('%s Description', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

             if ($show_editor) {

                 $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

@@ -2340,16 +2340,16 @@ 
                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

-                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea>

             <?php } if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just after the description field.

              *

@@ -2388,7 +2388,7 @@ 
         $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

         $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just before the tags field.

              *

@@ -2399,14 +2399,14 @@ 
             $tags_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

+        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just after the tags field.

              *

@@ -2432,7 +2432,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2445,7 +2445,7 @@ 
             $listing_type = $post->listing_type;

 

         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $post = geodir_get_post_info((int)$_REQUEST['pid']);

+            $post = geodir_get_post_info((int) $_REQUEST['pid']);

             $listing_type = $post->post_type;

             $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

@@ -2459,7 +2459,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2480,15 +2480,15 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($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 > 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 == '') {

-                    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>

 

@@ -2503,11 +2503,11 @@ 
                 <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><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

-                          id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+                          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>

@@ -2520,7 +2520,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>

 

@@ -2532,7 +2532,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2543,7 +2543,7 @@ 
         </script>

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2553,10 +2553,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2618,7 +2618,7 @@ 
         class="<?php

         /** This action is documented in geodirectory_template_actions.php */

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2638,11 +2638,11 @@ 
 

     global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+    $is_enable_signup = get_option('users_can_register');

     

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2659,7 +2659,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2684,7 +2684,7 @@ 
         foreach ($errors as $errorsObj) {

             foreach ($errorsObj as $key => $val) {

                 for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+                    echo "<div class=error_msg_fix>".$val[$i].'</div>';

                     $registration_error_msg = 1;

                 }

             }

@@ -2701,10 +2701,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

 

-    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

+    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup) { ?>

 

         <div class="registration_form">

             <?php

@@ -2713,7 +2713,7 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

@@ -2725,10 +2725,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

         

-        <?php if ( $is_enable_signup ) { ?>

+        <?php if ($is_enable_signup) { ?>

             <div class="registration_form_r">

                 <?php

                 /**

@@ -2736,7 +2736,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+                include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2773,12 +2773,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

     if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

+    $list_title = $add_string_in_title.$post_type_info->labels->name;

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type);

@@ -2786,12 +2786,12 @@ 
     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+            $list_title .= __(' in', 'geodirectory')." '".geodir_ucwords($current_term->name)."'";

     }

 

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($post_type_info->labels->name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** This action is documented in geodirectory_template_actions.php */

@@ -2800,11 +2800,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

-        if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

+        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2818,16 +2818,16 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the author page title text.

          *

          * @since 1.0.0

          * @param string $list_title The title for the page.

          */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+        apply_filters('geodir_author_page_title_text', $title).'</h1></header>';

 }

 

 

@@ -3032,19 +3032,19 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($pt_name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', wptexturize($list_title)).'</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3448,7 +3448,7 @@ 
         $gd_post_type = geodir_get_current_posttype();

         $post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' :', 'geodirectory');

     }

     return $list_title;

 }

@@ -3465,7 +3465,7 @@ 
  * @param string $position Position to add the post content. 'before' or 'after'. Default 'before'.

  * @param string $gd_page The geodirectory page type. Default null.

  */

-function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

+function geodir_add_page_content($position = 'before', $gd_page = '') {

     global $post;

 

     $gd_page_id = NULL;

@@ -3542,17 +3542,17 @@ 
  * @param WP_Post $post           WP_Post object.

  * @return string Filtered SQL JOIN clause.

  */

-function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_join($join, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $plugin_prefix;

 

-    if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+    if (!empty($post->post_type) && in_array($post->post_type, geodir_get_posttypes())) {

+        $join .= " INNER JOIN ".$plugin_prefix.$post->post_type."_detail AS gd ON gd.post_id = p.ID";

     }

     

     return $join;

 }

-add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

-add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

+add_filter('get_previous_post_join', 'geodir_previous_next_post_join', 10, 5);

+add_filter('get_next_post_join', 'geodir_previous_next_post_join', 10, 5);

 

 /**

  * Filters the WHERE clause in the SQL for an adjacent post query.

@@ -3570,32 +3570,32 @@ 
  * @param WP_Post $post          WP_Post object.

  * @return string Filtered SQL WHERE clause.

  */

-function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_where($where, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+    if (!empty($post->post_type) && (!empty($post->country_slug) || !empty($post->region_slug) || !empty($post->city_slug)) && in_array($post->post_type, geodir_get_posttypes())) {

         $post_locations = '';

         $post_locations_var = array();

         

-        if ( !empty( $post->country_slug ) ) {

+        if (!empty($post->country_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

+            $post_locations_var[] = "%,[".$post->country_slug."]";

         }

 

-        if ( !empty( $post->region_slug ) ) {

+        if (!empty($post->region_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

+            $post_locations_var[] = "%,[".$post->region_slug."],%";

         }

 

-        if ( !empty( $post->city_slug ) ) {

+        if (!empty($post->city_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

+            $post_locations_var[] = "[".$post->city_slug."],%";

         }

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

+        $where .= $wpdb->prepare($post_locations, $post_locations_var);

     }

     

     return $where;

 }

-add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

-add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file
+add_filter('get_previous_post_where', 'geodir_previous_next_post_where', 10, 5);

+add_filter('get_next_post_where', 'geodir_previous_next_post_where', 10, 5);
\ No newline at end of file