GeoDirectory / geodirectory

geodirectory-functions/listing_filters.php

Braces +30 added lines, -19 removed lines

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

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

+    if (!session_id()) {
+    	session_start();
+    }
     global $geodir_add_location_url;

 

     $geodir_add_location_url = NULL;

@@ -86,7 +88,9 @@ 
 

     if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') {
+        	$_REQUEST['scat'] = '';
+        }
         //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

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

@@ -198,8 +202,9 @@ 
         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

         geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+        if (!is_admin()) {
+                    add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+        }
 

         // advanced filter for popular post view widget

         global $wp_query;

@@ -346,8 +351,9 @@ 
     $sort_by = '';

     $orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+    if (get_query_var('order_by')) {
+            $sort_by = get_query_var('order_by');
+    }
 

     /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

@@ -367,14 +373,16 @@ 
         $orderby .= " distance,";

     }

 

-    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) {
+            $sort_by = esc_attr($_REQUEST['sort_by']);
+    }
 

 

     if ($sort_by == '') {

         $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

+        if (!empty($default_sort)) {
+                    $sort_by = $default_sort;
+        }
     }

 

     /*

@@ -562,8 +570,9 @@ 
 

             add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+            if ($snear != '') {
+                            add_filter('posts_where', 'searching_filter_where', 1);
+            }
 

             add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

@@ -731,10 +740,11 @@ 
     }

 

     $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

+    if (isset($_REQUEST['stype'])) {
+            $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));
+    } else {
+            $post_types = 'gd_place';
+    }
 

     if ($s != '') {

         $keywords = explode(" ", $s);

@@ -762,7 +772,7 @@ 
     if($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else{$taxonomies='';}

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -878,8 +888,9 @@ 
             $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

             $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

             $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

+        } else {
+                    $where .= " AND $wpdb->posts.post_author = $user_id";
+        }
 

         if ($user_id == (int)get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

Indentation +511 added lines, -511 removed lines

@@ -16,10 +16,10 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

-    global $geodir_add_location_url;

+	if (!session_id()) session_start();

+	global $geodir_add_location_url;

 

-    $geodir_add_location_url = NULL;

+	$geodir_add_location_url = NULL;

 }

 

 /**

@@ -33,18 +33,18 @@ 
  */

 function geodir_modified_query($query)

 {

-    if ($query->is_main_query() && (

-            (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            || geodir_is_page('listing')

-            || geodir_is_page('author')

-            || geodir_is_page('search')

-            || geodir_is_page('detail'))

-    ) {

-

-        $query->set('is_geodir_loop', true);

-    }

+	if ($query->is_main_query() && (

+			(geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

+			|| geodir_is_page('listing')

+			|| geodir_is_page('author')

+			|| geodir_is_page('search')

+			|| geodir_is_page('detail'))

+	) {

+

+		$query->set('is_geodir_loop', true);

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -67,81 +67,81 @@ 
  */

 function set_listing_request()

 {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

 

-    // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    /* remove all pre filters */

-    remove_all_filters('query');

-    remove_all_filters('posts_search');

-    remove_all_filters('posts_fields');

-    remove_all_filters('posts_join');

-    remove_all_filters('posts_orderby');

-    remove_all_filters('posts_where');

+	/* remove all pre filters */

+	remove_all_filters('query');

+	remove_all_filters('posts_search');

+	remove_all_filters('posts_fields');

+	remove_all_filters('posts_join');

+	remove_all_filters('posts_orderby');

+	remove_all_filters('posts_where');

 

 

-    if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

+	if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

-        //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

+		if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+		//if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

-        if (isset($_REQUEST['sdist'])) {

-            ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

-        } elseif (get_option('geodir_search_dist') != '') {

-            $dist = get_option('geodir_search_dist');

+		if (isset($_REQUEST['sdist'])) {

+			($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

+		} elseif (get_option('geodir_search_dist') != '') {

+			$dist = get_option('geodir_search_dist');

 

-        } else {

-            $dist = 25000;

-        } //  Distance

+		} else {

+			$dist = 25000;

+		} //  Distance

 

-        if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

-        } else {

-            $mylat = (float)geodir_get_current_city_lat();

-        } //  Latatude

+		if (isset($_REQUEST['sgeo_lat'])) {

+			$mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+		} else {

+			$mylat = (float)geodir_get_current_city_lat();

+		} //  Latatude

 

-        if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

-        } else {

-            $mylon = (float)geodir_get_current_city_lng();

-        } //  Distance

+		if (isset($_REQUEST['sgeo_lon'])) {

+			$mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+		} else {

+			$mylon = (float)geodir_get_current_city_lng();

+		} //  Distance

 

-        if (isset($_REQUEST['snear'])) {

-            $snear = trim(esc_attr($_REQUEST['snear']));

-        }

+		if (isset($_REQUEST['snear'])) {

+			$snear = trim(esc_attr($_REQUEST['snear']));

+		}

 

-        if (isset($_REQUEST['s'])) {

-            $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

-        }

+		if (isset($_REQUEST['s'])) {

+			$s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

+		}

 

-        if ($snear == 'NEAR ME') {

-            $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

-            $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

-            $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

-        }

+		if ($snear == 'NEAR ME') {

+			$ip = $_SERVER['REMOTE_ADDR'];

+			$addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+			$mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

+			$mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

+		}

 

 

-        if (strstr($s, ',')) {

-            $s_AA = str_replace(" ", "", $s);

-            $s_A = explode(",", $s_AA);

-            $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

-        } else {

-            $s_A = '"' . $s . '"';

-        }

+		if (strstr($s, ',')) {

+			$s_AA = str_replace(" ", "", $s);

+			$s_A = explode(",", $s_AA);

+			$s_A = implode('","', $s_A);

+			$s_A = '"' . $s_A . '"';

+		} else {

+			$s_A = '"' . $s . '"';

+		}

 

-        if (strstr($s, ' ')) {

-            $s_SA = explode(" ", $s);

-        } else {

-            $s_SA = '';

-        }

+		if (strstr($s, ' ')) {

+			$s_SA = explode(" ", $s);

+		} else {

+			$s_SA = '';

+		}

 

-    endif;

+	endif;

 

 

 

@@ -162,56 +162,56 @@ 
  */

 function geodir_listing_loop_filter($query)

 {

-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

 

-    // fix wp_reset_query for popular post view widget

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix wp_reset_query for popular post view widget

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    $geodir_post_type = geodir_get_current_posttype();

-

-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

-

-        if (isset($wp_query->query[$taxonomies[0]])) {

-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);

-            $request_term = end($request_term);

-            if (!term_exists($request_term)) {

-                $args = array('number' => '1',);

-                $terms_arr = get_terms($taxonomies[0], $args);

-                foreach ($terms_arr as $location_term) {

-                    $term_arr = $location_term;

-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

-                }

-                $wp_query->queried_object_id = 1;

-                $wp_query->queried_object = $term_arr;

-                //print_r($wp_query) ;

-            }

-        }

+	$geodir_post_type = geodir_get_current_posttype();

+

+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

+

+		if (isset($wp_query->query[$taxonomies[0]])) {

+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);

+			$request_term = end($request_term);

+			if (!term_exists($request_term)) {

+				$args = array('number' => '1',);

+				$terms_arr = get_terms($taxonomies[0], $args);

+				foreach ($terms_arr as $location_term) {

+					$term_arr = $location_term;

+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

+				}

+				$wp_query->queried_object_id = 1;

+				$wp_query->queried_object = $term_arr;

+				//print_r($wp_query) ;

+			}

+		}

 

-    }

-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

-

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

-

-        add_filter('posts_fields', 'geodir_posts_fields', 1);

-        add_filter('posts_join', 'geodir_posts_join', 1);

-        geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

-

-        // advanced filter for popular post view widget

-        global $wp_query;

-        if (!is_admin()) {

-            if (!empty($wp_query->query['with_pics_only'])) {

-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);

-            }

-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);

-        }

+	}

+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-    }

-    return $query;

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

+

+		add_filter('posts_fields', 'geodir_posts_fields', 1);

+		add_filter('posts_join', 'geodir_posts_join', 1);

+		geodir_post_where();

+		if (!is_admin())

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+

+		// advanced filter for popular post view widget

+		global $wp_query;

+		if (!is_admin()) {

+			if (!empty($wp_query->query['with_pics_only'])) {

+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);

+			}

+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);

+		}

+

+	}

+	return $query;

 }

 

 

@@ -230,67 +230,67 @@ 
  * @return string Modified fields query string.

  */

 function geodir_posts_fields($fields) {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

-    // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+	// Filter-Location-Manager to add location table.

+	$fields .= ", " . $table . ".* ";

     

 	if ($snear != '' || $gd_session->get('all_near_me')) {

-        $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+		$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

         

 		if ($gd_session->get('all_near_me')) {

-            $mylat = $gd_session->get('user_lat');

-            $mylon = $gd_session->get('user_lon');

-        }

-

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    }

-

-    global $s;

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+			$mylat = $gd_session->get('user_lat');

+			$mylon = $gd_session->get('user_lon');

+		}

 

+		$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	}

 

-        if (count($keywords) > 1) {

-            $parts = array(

-                'AND' => 'gd_alltitlematch_part',

-                'OR' => 'gd_titlematch_part'

-            );

-            $gd_titlematch_part = "";

-            foreach ($parts as $key => $part) {

-                $gd_titlematch_part .= " CASE WHEN ";

-                $count = 0;

-                foreach ($keywords as $keyword) {

-                    $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+	global $s;

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+

+		if (count($keywords) > 1) {

+			$parts = array(

+				'AND' => 'gd_alltitlematch_part',

+				'OR' => 'gd_titlematch_part'

+			);

+			$gd_titlematch_part = "";

+			foreach ($parts as $key => $part) {

+				$gd_titlematch_part .= " CASE WHEN ";

+				$count = 0;

+				foreach ($keywords as $keyword) {

+					$keyword = trim($keyword);

+					$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

 					$count++;

-                    if ($count < count($keywords)) {

-                       // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

+					if ($count < count($keywords)) {

+					   // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

-                    } else {

-                        //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

+					} else {

+						//$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

-                    }

-                }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

-            }

-        } else {

-            $gd_titlematch_part = "";

-        }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

+					}

+				}

+				$gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+			}

+		} else {

+			$gd_titlematch_part = "";

+		}

+		$s = stripslashes_deep( $s );

+		$s = wp_specialchars_decode($s,ENT_QUOTES);

 		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -307,26 +307,26 @@ 
  */

 function geodir_posts_join($join)

 {

-    global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

+	global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

 

-    ########### WPML ###########

+	########### WPML ###########

 

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

-        }

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		if ($lang_code) {

+			$join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

-    //===old code start

-    //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

+	$join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+	//===old code start

+	//$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

-    return $join;

+	return $join;

 }

 

 

@@ -344,15 +344,15 @@ 
  */

 function geodir_posts_orderby($orderby)

 {

-    global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

+	global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

 

-    $sort_by = '';

-    $orderby = ' ';

+	$sort_by = '';

+	$orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+	if (get_query_var('order_by'))

+		$sort_by = get_query_var('order_by');

 

-    /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

+	/*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

     }

 

@@ -366,116 +366,116 @@ 
     }*/

 

 

-    if ($snear != '') {

-        $orderby .= " distance,";

-    }

+	if ($snear != '') {

+		$orderby .= " distance,";

+	}

 

-    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+	if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

+		$sort_by = esc_attr($_REQUEST['sort_by']);

 

 

-    if ($sort_by == '') {

-        $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

-    }

+	if ($sort_by == '') {

+		$default_sort = geodir_get_posts_default_sort($geodir_post_type);

+		if (!empty($default_sort))

+			$sort_by = $default_sort;

+	}

 

-    /*

+	/*

     if search by term & no location then order always "relevance"

     if search by location then order always "nearest"

     */

-    if (is_main_query() && geodir_is_page('search')) {

-        $search_term = get_query_var('s');

+	if (is_main_query() && geodir_is_page('search')) {

+		$search_term = get_query_var('s');

 

-        if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

-            $sort_by = 'az';

-        }

+		if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

+			$sort_by = 'az';

+		}

 

-        if ($snear != '') {

-            $sort_by = 'nearest';

-        }

-    }

+		if ($snear != '') {

+			$sort_by = 'nearest';

+		}

+	}

 

-    switch ($sort_by):

-        case 'newest':

-            $orderby = "$wpdb->posts.post_date desc, ";

-            break;

-        case 'oldest':

-            $orderby = "$wpdb->posts.post_date asc, ";

-            break;

-        case 'low_review':

-        case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

-            break;

-        case 'high_review':

-        case 'rating_count_desc':

+	switch ($sort_by):

+		case 'newest':

+			$orderby = "$wpdb->posts.post_date desc, ";

+			break;

+		case 'oldest':

+			$orderby = "$wpdb->posts.post_date asc, ";

+			break;

+		case 'low_review':

+		case 'rating_count_asc':

+			$orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+			break;

+		case 'high_review':

+		case 'rating_count_desc':

 			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

-            break;

-        case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

-            break;

-        case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'featured':

-            $orderby = $table . ".is_featured asc, ";

-            break;

-        case 'nearest':

-            $orderby = " distance asc, ";

-            break;

-        case 'farthest':

-            $orderby = " distance desc, ";

-            break;

-        case 'random':

-            $orderby = " rand(), ";

-            break;

-        case 'az':

-            $orderby = "$wpdb->posts.post_title asc, ";

-            break;

-        default:

-

-            break;

-    endswitch;

-

-    global $s;

-

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

-        if ($sort_by == 'nearest' || $sort_by == 'farthest') {

-            if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

-            } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

-            }

-        } else {

-            if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

-            } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

-            }

-        }

-    }

+			break;

+		case 'low_rating':

+			$orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+			break;

+		case 'high_rating':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'featured':

+			$orderby = $table . ".is_featured asc, ";

+			break;

+		case 'nearest':

+			$orderby = " distance asc, ";

+			break;

+		case 'farthest':

+			$orderby = " distance desc, ";

+			break;

+		case 'random':

+			$orderby = " rand(), ";

+			break;

+		case 'az':

+			$orderby = "$wpdb->posts.post_title asc, ";

+			break;

+		default:

+

+			break;

+	endswitch;

+

+	global $s;

+

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+		if ($sort_by == 'nearest' || $sort_by == 'farthest') {

+			if (count($keywords) > 1) {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+			} else {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+			}

+		} else {

+			if (count($keywords) > 1) {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+			} else {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+			}

+		}

+	}

 

-    /**

-     * Filter order by SQL.

-     *

-     * @since 1.0.0

-     * @param string $orderby The orderby query string.

-     * @param string $sort_by Sortby query string.

-     * @param string $table Listing table name.

-     */

-    $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

+	/**

+	 * Filter order by SQL.

+	 *

+	 * @since 1.0.0

+	 * @param string $orderby The orderby query string.

+	 * @param string $sort_by Sortby query string.

+	 * @param string $table Listing table name.

+	 */

+	$orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+	$orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

-    return $orderby;

+	return $orderby;

 }

 

 

@@ -493,53 +493,53 @@ 
 function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($sort_by != '' && !is_search()) {

+	if ($sort_by != '' && !is_search()) {

 

-        $sort_array = explode('_', $sort_by);

+		$sort_array = explode('_', $sort_by);

 

-        $sort_by_count = count($sort_array);

+		$sort_by_count = count($sort_array);

 

-        $order = $sort_array[$sort_by_count - 1];

+		$order = $sort_array[$sort_by_count - 1];

 

-        if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

+		if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+			$sort_by = str_replace('_' . $order, '', $sort_by);

 

-            switch ($sort_by):

+			switch ($sort_by):

 

-                case 'post_date':

-                case 'comment_count':

+				case 'post_date':

+				case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

-                    break;

+					$orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+					break;

 

-                case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

-                    break;

+				case 'distance':

+					$orderby = $sort_by . " " . $order . ", ";

+					break;

 

 

-                // sort by rating

-                case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+				// sort by rating

+				case 'overall_rating':

+					$orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

 

-                    break;

+					break;

 

 

-                default:

-                    if (geodir_column_exist($table, $sort_by)) {

+				default:

+					if (geodir_column_exist($table, $sort_by)) {

 						$orderby = $table . "." . $sort_by . " " . $order . ", ";

 					}

-                    break;

+					break;

 

-            endswitch;

+			endswitch;

 

-        }

+		}

 

-    }

+	}

 

-    return $orderby;

+	return $orderby;

 }

 

 /**

@@ -554,34 +554,34 @@ 
 {

 

 

-    global $wpdb, $geodir_post_type, $table, $s, $snear;

+	global $wpdb, $geodir_post_type, $table, $s, $snear;

 

-    if (!is_admin()) {

+	if (!is_admin()) {

 

-        if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            add_filter('posts_where', 'geodir_edit_listing_where', 1);

+		if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			add_filter('posts_where', 'geodir_edit_listing_where', 1);

 

-        } elseif ((is_search() && $_REQUEST['geodir_search'])) {

+		} elseif ((is_search() && $_REQUEST['geodir_search'])) {

 

-            add_filter('posts_where', 'searching_filter_where', 1);

+			add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+			if ($snear != '')

+				add_filter('posts_where', 'searching_filter_where', 1);

 

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

-        } elseif (geodir_is_page('author')) {

+		} elseif (geodir_is_page('author')) {

 

-            add_filter('posts_where', 'author_filter_where', 1);

+			add_filter('posts_where', 'author_filter_where', 1);

 

-        }

+		}

 

-        //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+		//if (!geodir_is_page('detail'))

+			add_filter('posts_where', 'geodir_default_where', 1);/**/

 

-        //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

+		//add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

-    }

+	}

 }

 

 /**

@@ -596,13 +596,13 @@ 
  */

 function geodir_preview_post_cap($allcaps, $caps, $args)

 {

-    $user_id = get_current_user_id();

-    if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

+	$user_id = get_current_user_id();

+	if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

 

-        $allcaps['edit_posts'] = true;

-    }

-    //print_r($allcaps);

-    return $allcaps;

+		$allcaps['edit_posts'] = true;

+	}

+	//print_r($allcaps);

+	return $allcaps;

 }

 

 

@@ -617,9 +617,9 @@ 
  */

 function geodir_edit_listing_where($where)

 {

-    global $wpdb;

-    $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

-    return $where;

+	global $wpdb;

+	$where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

+	return $where;

 }

 

 

@@ -636,29 +636,29 @@ 
  */

 function geodir_default_where($where)

 {

-    global $wp_query, $wpdb;

-

-    //print_r($wp_query);

-    ########### WPML ###########

-

-    if (function_exists('icl_object_id')) {

-        global $sitepress, $table_prefix;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

-        //echo '##########'.$q_post_type;

-        if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

-            //$where .= " AND icl_t.language_code = '$lang_code' ";

-        }

+	global $wp_query, $wpdb;

 

-    }

-    ########### WPML ###########

+	//print_r($wp_query);

+	########### WPML ###########

 

+	if (function_exists('icl_object_id')) {

+		global $sitepress, $table_prefix;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		$q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

+		//echo '##########'.$q_post_type;

+		if ($lang_code && $q_post_type) {

+			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+			//$where .= " AND icl_t.language_code = '$lang_code' ";

+		}

 

-    return $where = str_replace("0 = 1", "1=1", $where);

+	}

+	########### WPML ###########

 

-    /* ====== old code start ===

+

+	return $where = str_replace("0 = 1", "1=1", $where);

+

+	/* ====== old code start ===

     $where = str_replace("0 = 1", "1=1", $where);

     $country = get_query_var('gd_country');

     $region = get_query_var('gd_region');

@@ -699,108 +699,108 @@ 
  * @return string Modified where query string.

  */

 function searching_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

+	global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

 	

-    $search_term = 'OR';

-    $search_term = 'AND';

-    $geodir_custom_search = '';

-    $category_search_range = '';

+	$search_term = 'OR';

+	$search_term = 'AND';

+	$geodir_custom_search = '';

+	$category_search_range = '';

 

-    if (is_single() && get_query_var('post_type')) {

+	if (is_single() && get_query_var('post_type')) {

 		return $where;

 	}

 

-    if (is_tax()) {

+	if (is_tax()) {

 		return $where;

 	}

 	

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

-

-    $where = '';

-    $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

-

-    if ($s != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+	$s  = wp_specialchars_decode($s ,ENT_QUOTES);

+	$s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

 

-        if (!empty($keywords)) {

-            foreach ($keywords as $keyword) {

-                $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

-                if ($keyword != '') {

-                    /**

-                     * Filter the search query keywords SQL.

-                     *

-                     * @since 1.5.9

-                     * @package GeoDirectory

-                     * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

-                     * @param array $keywords The array of keywords for the query.

-                     * @param string $keyword The single keyword being searched.

-                     */

+	$where = '';

+	$better_search_terms = '';

+	if (isset($_REQUEST['stype']))

+		$post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

+	else

+		$post_types = 'gd_place';

+

+	if ($s != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+		if (!empty($keywords)) {

+			foreach ($keywords as $keyword) {

+				$keyword = trim($keyword);

+				$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+				if ($keyword != '') {

+					/**

+					 * Filter the search query keywords SQL.

+					 *

+					 * @since 1.5.9

+					 * @package GeoDirectory

+					 * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

+					 * @param array $keywords The array of keywords for the query.

+					 * @param string $keyword The single keyword being searched.

+					 */

 					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

-                }

-            }

-        }

-    }

+				}

+			}

+		}

+	}

 

-    /* get taxonomy */

-    $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

-        $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+	/* get taxonomy */

+	$taxonomies = geodir_get_taxonomies($post_types, true);

+	if($taxonomies) {

+		$taxonomies = implode("','", $taxonomies);

+		$taxonomies = "'" . $taxonomies . "'";

+	}else{$taxonomies='';}

 

-    $content_where = $terms_where = '';

+	$content_where = $terms_where = '';

 	if ($s != '') {

-        /**

-         * Filter the search query content where values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

-         */

+		/**

+		 * Filter the search query content where values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

+		 */

 		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

-        /**

-         * Filter the search query term values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

-         */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+		/**

+		 * Filter the search query term values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

+		 */

+		$terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 		

-    if ($snear != '') {

+	if ($snear != '') {

 

 

-        if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

-            $dist = $gd_session->get('near_me_range');

-        }

-        $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lat1 = $mylat - ($dist / 69);

-        $lat2 = $mylat + ($dist / 69);

+		if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

+			$dist = $gd_session->get('near_me_range');

+		}

+		$lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lat1 = $mylat - ($dist / 69);

+		$lat2 = $mylat + ($dist / 69);

 

-        $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

-        $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

-        $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

-        $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

+		$rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

+		$rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

+		$rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

+		$rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

 

 

 

-	    $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+		$where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

 			                    $content_where 

 								OR ($wpdb->posts.ID IN( 

 										SELECT $wpdb->term_relationships.object_id as post_id 

@@ -817,13 +817,13 @@ 
 						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

 						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

 

-        if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

-            $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

-        }

+		if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

+			$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+			$where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+		}

 

-    } else {

-        $where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+	} else {

+		$where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

                             $content_where  

 							OR ( $wpdb->posts.ID IN(	

 									SELECT $wpdb->term_relationships.object_id as post_id                     

@@ -837,19 +837,19 @@ 
 					) 

 				AND $wpdb->posts.post_type in ('$post_types')

 				AND ($wpdb->posts.post_status = 'publish') ";

-    }

+	}

 	

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {       

+	if ( function_exists( 'icl_object_id' ) ) {       

 		$lang_code = ICL_LANGUAGE_CODE;

 		

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

-        }

-    }

-    ########### WPML ###########

+			$where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+		}

+	}

+	########### WPML ###########

 	

-    return $where;

+	return $where;

 }

 

 

@@ -864,45 +864,45 @@ 
  * @return string Modified where query string.

  */

 function author_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $curr;

+	global $wpdb, $geodir_post_type, $table, $curr;

 

-    $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+	$curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

+	$user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

     

-    if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

-    } else {

-        $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

-    }

+	if (isset($_REQUEST['stype'])) {

+		$where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+	} else {

+		$where = " AND $wpdb->posts.post_type IN ('gd_place') ";

+	}

 

-    if ($user_id > 0) {

-        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-            $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

-            $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

-            $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

-

-        if ($user_id == (int)get_current_user_id()) {

-            $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

-        } else {

-            $where .= " AND $wpdb->posts.post_status = 'publish' ";

-        }

-    } else {

-        $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

-    }

+	if ($user_id > 0) {

+		if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

+			$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

+			$user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

+			$where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

+		} else

+			$where .= " AND $wpdb->posts.post_author = $user_id";

+

+		if ($user_id == (int)get_current_user_id()) {

+			$where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

+		} else {

+			$where .= " AND $wpdb->posts.post_status = 'publish' ";

+		}

+	} else {

+		$where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

+	}

 

-    ########### WPML ###########

-    if (function_exists('icl_object_id')) {

-        $lang_code = ICL_LANGUAGE_CODE;

-        if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

-        }

+	########### WPML ###########

+	if (function_exists('icl_object_id')) {

+		$lang_code = ICL_LANGUAGE_CODE;

+		if ($lang_code) {

+			$where .= " AND icl_t.language_code='" . $lang_code . "' ";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

     

-    return $where;

+	return $where;

 }

 

 /**

@@ -917,11 +917,11 @@ 
  */

 function geodir_filter_widget_join($join)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

-    }

-    return $join;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	}

+	return $join;

 }

 

 /**

@@ -936,42 +936,42 @@ 
  */

 function geodir_filter_widget_where($where)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

-    }

-    if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

-    }

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

-    }

-    if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

-    }

-    return $where;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['show_featured_only'])) {

+		$where .= " AND " . $table . ".is_featured = '1'";

+	}

+	if (!empty($wp_query->query['show_special_only'])) {

+		$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+	}

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+	}

+	if (!empty($wp_query->query['with_videos_only'])) {

+		$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+	}

+	return $where;

 }

 

 

 function geodir_related_posts_fields($fields) {

-    global $wp_query, $wpdb, $table, $post;

+	global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+	$fields .= ", " . $table . ".* ";

 

-    $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+	$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

-    $mylat = $post->post_latitude;

-    $mylon = $post->post_longitude;

+	$mylat = $post->post_latitude;

+	$mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    return $fields;

+	$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

-        && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

-        && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

-    ) {

-        add_filter('posts_fields', 'geodir_related_posts_fields', 1);

-    }

+	if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+		&& isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

+		&& isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

+	) {

+		add_filter('posts_fields', 'geodir_related_posts_fields', 1);

+	}

 }

 add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
\ No newline at end of file

Spacing +71 added lines, -71 removed lines

@@ -99,15 +99,15 @@ 
         } //  Distance

 

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

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latatude

 

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

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

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

@@ -120,7 +120,7 @@ 
 

         if ($snear == 'NEAR ME') {

             $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));

             $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

             $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

         }

@@ -130,9 +130,9 @@ 
             $s_AA = str_replace(" ", "", $s);

             $s_A = explode(",", $s_AA);

             $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

+            $s_A = '"'.$s_A.'"';

         } else {

-            $s_A = '"' . $s . '"';

+            $s_A = '"'.$s.'"';

         }

 

         if (strstr($s, ' ')) {

@@ -193,7 +193,7 @@ 
     }

     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

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

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

 

         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

@@ -233,7 +233,7 @@ 
     global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

     // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

     

 	if ($snear != '' || $gd_session->get('all_near_me')) {

         $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

@@ -243,16 +243,16 @@ 
             $mylon = $gd_session->get('user_lon');

         }

 

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+        $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     }

 

     global $s;

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -270,24 +270,24 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                    $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

 					$count++;

                     if ($count < count($keywords)) {

                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." ";

                     } else {

                         //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ";

                     }

                 }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.",";

             }

         } else {

             $gd_titlematch_part = "";

         }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

-		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

+        $s = stripslashes_deep($s);

+        $s = wp_specialchars_decode($s, ENT_QUOTES);

+		$fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));

     }

 

     return $fields;

@@ -316,13 +316,13 @@ 
         $lang_code = ICL_LANGUAGE_CODE;

         $default_lang_code = $sitepress->get_default_language();

         if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+            $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

         }

 

     }

     ########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+    $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID)  ";

     //===old code start

     //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

@@ -405,20 +405,20 @@ 
             break;

         case 'low_review':

         case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+            $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, ";

             break;

         case 'high_review':

         case 'rating_count_desc':

-			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			$orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

             break;

         case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+            $orderby = "( ".$table.".overall_rating  ) ASC, ".$table.".rating_count ASC,  ";

             break;

         case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'featured':

-            $orderby = $table . ".is_featured asc, ";

+            $orderby = $table.".is_featured asc, ";

             break;

         case 'nearest':

             $orderby = " distance asc, ";

@@ -441,24 +441,24 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

         }

         if ($sort_by == 'nearest' || $sort_by == 'farthest') {

             if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

             } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

             }

         } else {

             if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby;

             } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby;

             }

         }

     }

@@ -473,7 +473,7 @@ 
      */

     $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+    $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

     return $orderby;

 }

@@ -505,31 +505,31 @@ 
 

         if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+            $sort_by = str_replace('_'.$order, '', $sort_by);

 

             switch ($sort_by):

 

                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", ";

                     break;

 

                 case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

+                    $orderby = $sort_by." ".$order.", ";

                     break;

 

 

                 // sort by rating

                 case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+                    $orderby = " ".$table.".".$sort_by."  ".$order.", ".$table.".rating_count ".$order.", ";

 

                     break;

 

 

                 default:

                     if (geodir_column_exist($table, $sort_by)) {

-						$orderby = $table . "." . $sort_by . " " . $order . ", ";

+						$orderby = $table.".".$sort_by." ".$order.", ";

 					}

                     break;

 

@@ -577,7 +577,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -648,7 +648,7 @@ 
         $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

         //echo '##########'.$q_post_type;

         if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";

             //$where .= " AND icl_t.language_code = '$lang_code' ";

         }

 

@@ -715,8 +715,8 @@ 
 	}

 	

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+    $s = wp_specialchars_decode($s, ENT_QUOTES);

+    $s_A = wp_specialchars_decode($s_A, ENT_QUOTES);

 

     $where = '';

     $better_search_terms = '';

@@ -727,9 +727,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -738,7 +738,7 @@ 
         if (!empty($keywords)) {

             foreach ($keywords as $keyword) {

                 $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

                 if ($keyword != '') {

                     /**

                      * Filter the search query keywords SQL.

@@ -749,7 +749,7 @@ 
                      * @param array $keywords The array of keywords for the query.

                      * @param string $keyword The single keyword being searched.

                      */

-					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

+					$better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);

                 }

             }

         }

@@ -757,10 +757,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+        $taxonomies = "'".$taxonomies."'";

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -771,7 +771,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+		$content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -779,7 +779,7 @@ 
          * @package GeoDirectory

          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+        $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 		

     if ($snear != '') {

@@ -814,12 +814,12 @@ 
 							)

 						AND $wpdb->posts.post_type in ('{$post_types}')

 						AND ($wpdb->posts.post_status = 'publish')

-						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

-						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

+						AND ( ".$table.".post_latitude between $rlat1 and $rlat2 )

+						AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) ";

 

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

             $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+            $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;

         }

 

     } else {

@@ -840,11 +840,11 @@ 
     }

 	

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {       

+    if (function_exists('icl_object_id')) {       

 		$lang_code = ICL_LANGUAGE_CODE;

 		

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";

         }

     }

     ########### WPML ###########

@@ -867,10 +867,10 @@ 
     global $wpdb, $geodir_post_type, $table, $curr;

 

     $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+    $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0;

     

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

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

@@ -883,7 +883,7 @@ 
         } else

             $where .= " AND $wpdb->posts.post_author = $user_id";

 

-        if ($user_id == (int)get_current_user_id()) {

+        if ($user_id == (int) get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

         } else {

             $where .= " AND $wpdb->posts.post_status = 'publish' ";

@@ -896,7 +896,7 @@ 
     if (function_exists('icl_object_id')) {

         $lang_code = ICL_LANGUAGE_CODE;

         if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

+            $where .= " AND icl_t.language_code='".$lang_code."' ";

         }

 

     }

@@ -919,7 +919,7 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+        $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

     }

     return $join;

 }

@@ -938,16 +938,16 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

+        $where .= " AND ".$table.".is_featured = '1'";

     }

     if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

     }

     if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+        $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id";

     }

     if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

     }

     return $where;

 }

@@ -956,18 +956,18 @@ 
 function geodir_related_posts_fields($fields) {

     global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

     $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

     $mylat = $post->post_latitude;

     $mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+    $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

         && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

         && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

     ) {

geodirectory-admin/admin_install.php

Indentation +160 added lines, -160 removed lines

@@ -24,8 +24,8 @@ 
 function geodir_activation()

 {

 

-    geodir_install();

-    add_action('wp_loaded', 'geodir_flush_activation');

+	geodir_install();

+	add_action('wp_loaded', 'geodir_flush_activation');

 }

 

 /**

@@ -36,9 +36,9 @@ 
  */

 function geodir_flush_activation()

 {

-    // Remove rewrite rules and then recreate rewrite rules.

-    // flush late so everything is loaded

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

@@ -50,44 +50,44 @@ 
  */

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

-    if (!get_option('geodir_default_data_installed')) {

-        geodir_create_tables(); // in admin db install.php

-        geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

-    if (!get_option('geodir_default_data_installed_1.2.8')) {

-        //geodir_create_tables(); // in admin db install.php

-        update_option('geodir_default_data_installed_1.2.8', 1);

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

+	if (!get_option('geodir_default_data_installed')) {

+		geodir_create_tables(); // in admin db install.php

+		geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

+	if (!get_option('geodir_default_data_installed_1.2.8')) {

+		//geodir_create_tables(); // in admin db install.php

+		update_option('geodir_default_data_installed_1.2.8', 1);

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

@@ -104,16 +104,16 @@ 
 function geodir_create_pages()

 {

 

-    //geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

+	//geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

 

-    //New since 1.5.3

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	//New since 1.5.3

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 

 

 }

@@ -129,11 +129,11 @@ 
  */

 function geodir_installation_end()

 {

-    //update_option( "geodir_db_version", GEODIRECTORY_VERSION );

+	//update_option( "geodir_db_version", GEODIRECTORY_VERSION );

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

@@ -147,45 +147,45 @@ 
  */

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/general_settings_array.php");

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/design_settings_array.php");

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/notifications_settings_array.php");

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/permalink_settings_array.php");

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

-    include_once("option-pages/title_meta_settings_array.php");

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/general_settings_array.php");

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/design_settings_array.php");

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/notifications_settings_array.php");

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/permalink_settings_array.php");

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/title_meta_settings_array.php");

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

@@ -199,103 +199,103 @@ 
 function geodir_set_default_widgets()

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

-    /*===========================*/

-    /*  Widgets ON HOME PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON HOME PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_home_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

-        array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_content'] =

+		array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

 

-    $widget_option_list['geodir_home_right'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_right'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON LISTING PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON LISTING PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_listing_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_listing_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON SEARCH PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON SEARCH PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_search_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_search_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_detail_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_detail_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON AUTHOR PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON AUTHOR PAGE     */

+	/*===========================*/

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

+	$widget_option_list['geodir_author_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

-    foreach ($widget_option_list as $key => $widget_options) {

+	foreach ($widget_option_list as $key => $widget_options) {

 

-        foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+		foreach ($widget_options as $key2 => $widget_options_obj) {

+			$widgetid = 'widget_' . $key2;

 

-            $widgetinfo[$widgetid][] = $widget_options_obj;

+			$widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+			$sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

 

-            $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

+			$widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

-        }

+		}

 

-        if (!empty($sidebarvalue_array[$key])) {

+		if (!empty($sidebarvalue_array[$key])) {

 

-            $sidebars_widgets = get_option('sidebars_widgets');

-            $sidebars_widgets[$key] = $sidebarvalue_array[$key];

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

+			$sidebars_widgets[$key] = $sidebarvalue_array[$key];

+			update_option('sidebars_widgets', $sidebars_widgets);

 

-            foreach ($widget_update as $key => $value) {

+			foreach ($widget_update as $key => $value) {

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

Spacing +2 added lines, -2 removed lines

@@ -271,11 +271,11 @@
     foreach ($widget_option_list as $key => $widget_options) {

 

         foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+            $widgetid = 'widget_'.$key2;

 

             $widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+            $sidebarvalue_array[$key][] = $key2."-".(count($widgetinfo[$widgetid]));

 

             $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

geodirectory-functions/compatibility/Jupiter.php

Indentation +141 added lines, -141 removed lines

@@ -16,28 +16,28 @@ 
  */
 function jupiter_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    // CAHNGE PAGE TITLES
-    remove_action('page_title', 'mk_page_title');
-    add_action('page_title', 'gd_mk_page_title');
-    // CHANGE BREADCRUMS FOR GD PAGES
-    remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
-    add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	// CAHNGE PAGE TITLES
+	remove_action('page_title', 'mk_page_title');
+	add_action('page_title', 'gd_mk_page_title');
+	// CHANGE BREADCRUMS FOR GD PAGES
+	remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
+	add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
 
 
 }
@@ -52,19 +52,19 @@ 
 function gd_mk_theme_breadcrumbs()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('listing')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('detail')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('search')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('author')) {
-        jupiter_geodir_breadcrumb();
-    } else {
-        mk_theme_breadcrumbs();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('listing')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('detail')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('search')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('author')) {
+		jupiter_geodir_breadcrumb();
+	} else {
+		mk_theme_breadcrumbs();
+	}
 }
 
 /**
@@ -76,35 +76,35 @@ 
  */
 function gd_mk_page_title()
 {
-    global $wp;
-
-
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_page_title();
-    } elseif (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $gd_title = ob_get_clean();
-        $gd_title = str_replace('<h1>', "", $gd_title);
-        $gd_title = str_replace('</h1>', "", $gd_title);
-        jupiter_geodir_page_title($gd_title);
-    } else {
-        mk_page_title();
-    }
+	global $wp;
+
+
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_page_title();
+	} elseif (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$gd_title = ob_get_clean();
+		$gd_title = str_replace('<h1>', "", $gd_title);
+		$gd_title = str_replace('</h1>', "", $gd_title);
+		jupiter_geodir_page_title($gd_title);
+	} else {
+		mk_page_title();
+	}
 
 
 }
@@ -119,48 +119,48 @@ 
  */
 function jupiter_geodir_breadcrumb()
 {
-    $item = '';
-    ob_start(); // Start buffering;
-    geodir_breadcrumb();
-    $gd_crums = ob_get_clean();
-    if ($gd_crums) {
-        $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
-        $gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
-        $gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
-        $gd_crums = str_replace('</li><li>', "", $gd_crums);
-        $gd_crums = explode(" > ", $gd_crums);
-        $trail_end = array_pop($gd_crums);
-        $gd_crums['trail_end'] = $trail_end;
-        //print_r($gd_crums);exit;
-        //print_r($trail);
-        $item = $gd_crums;
-
-    }
-    if (!$item) {
-        return;
-    }
-    global $mk_options, $post;
-    $post_id = global_get_post_id();
-
-    if ($post_id) {
-        $local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
-        $breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
-        if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
-            $breadcrumb_skin_class = $breadcrumb_skin;
-        } else {
-            $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-        }
-    } else {
-        $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-    }
-
-
-    $delimiter = ' &#47; ';
-
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
-
-    echo implode($delimiter, $item);
-    echo "</div></div>";
+	$item = '';
+	ob_start(); // Start buffering;
+	geodir_breadcrumb();
+	$gd_crums = ob_get_clean();
+	if ($gd_crums) {
+		$gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
+		$gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
+		$gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
+		$gd_crums = str_replace('</li><li>', "", $gd_crums);
+		$gd_crums = explode(" > ", $gd_crums);
+		$trail_end = array_pop($gd_crums);
+		$gd_crums['trail_end'] = $trail_end;
+		//print_r($gd_crums);exit;
+		//print_r($trail);
+		$item = $gd_crums;
+
+	}
+	if (!$item) {
+		return;
+	}
+	global $mk_options, $post;
+	$post_id = global_get_post_id();
+
+	if ($post_id) {
+		$local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
+		$breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
+		if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
+			$breadcrumb_skin_class = $breadcrumb_skin;
+		} else {
+			$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+		}
+	} else {
+		$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+	}
+
+
+	$delimiter = ' &#47; ';
+
+	echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+
+	echo implode($delimiter, $item);
+	echo "</div></div>";
 
 }
 
@@ -174,41 +174,41 @@ 
  */
 function jupiter_geodir_page_title($title = '', $subtitle = '')
 {
-    global $mk_options;
-
-    $post_id = global_get_post_id();
-    $shadow_css = '';
-    if ($mk_options['page_title_shadow'] == 'true') {
-        $shadow_css = 'mk-drop-shadow';
-    }
-
-    $align = !empty($align) ? $align : 'left';
-
-    //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
-    echo '<div class="mk-grid">';
-    if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
-
-    }
-
-    if (!empty($subtitle)) {
-        echo '<div class="page-introduce-subtitle">';
-        echo $subtitle;
-        echo '</div>';
-    }
-    if ($mk_options['disable_breadcrumb'] == 'true') {
-        if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
-            /**
-             * Calls the theme breadcrumbs for Jupiter theme.
-             *
-             * @since 1.4.0
-             */
-            do_action('theme_breadcrumbs', $post_id);
-        }
-    }
-
-    echo '<div class="clearboth"></div></div></section>';
+	global $mk_options;
+
+	$post_id = global_get_post_id();
+	$shadow_css = '';
+	if ($mk_options['page_title_shadow'] == 'true') {
+		$shadow_css = 'mk-drop-shadow';
+	}
+
+	$align = !empty($align) ? $align : 'left';
+
+	//$title = 'xxxx';
+	echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+	echo '<div class="mk-grid">';
+	if (!empty($title)) {
+		echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+
+	}
+
+	if (!empty($subtitle)) {
+		echo '<div class="page-introduce-subtitle">';
+		echo $subtitle;
+		echo '</div>';
+	}
+	if ($mk_options['disable_breadcrumb'] == 'true') {
+		if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
+			/**
+			 * Calls the theme breadcrumbs for Jupiter theme.
+			 *
+			 * @since 1.4.0
+			 */
+			do_action('theme_breadcrumbs', $post_id);
+		}
+	}
+
+	echo '<div class="clearboth"></div></div></section>';
 
 
 }

Spacing +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
 
     $delimiter = ' / ';
 
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner '.$breadcrumb_skin_class.'-skin">';
 
     echo implode($delimiter, $item);
     echo "</div></div>";
@@ -185,10 +185,10 @@ 
     $align = !empty($align) ? $align : 'left';
 
     //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+    echo '<section id="mk-page-introduce" class="intro-'.$align.'">';
     echo '<div class="mk-grid">';
     if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+        echo '<h1 class="page-introduce-title '.$shadow_css.'">'.$title.'</h1>';
 
     }
 

upgrade.php

Indentation +505 added lines, -505 removed lines

@@ -10,46 +10,46 @@ 
 global $wpdb;

 

 if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

-    /**

-     * Include custom database table related functions.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-admin/admin_db_install.php');

-    add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

-    if (GEODIRECTORY_VERSION <= '1.3.6') {

-        add_action('plugins_loaded', 'geodir_upgrade_136', 11);

-    }

+	/**

+	 * Include custom database table related functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-admin/admin_db_install.php');

+	add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

+	if (GEODIRECTORY_VERSION <= '1.3.6') {

+		add_action('plugins_loaded', 'geodir_upgrade_136', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.6') {

-        add_action('init', 'geodir_upgrade_146', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.6') {

+		add_action('init', 'geodir_upgrade_146', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.8') {

-        add_action('init', 'geodir_upgrade_148', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.8') {

+		add_action('init', 'geodir_upgrade_148', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.0') {

-        add_action('init', 'geodir_upgrade_150', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.0') {

+		add_action('init', 'geodir_upgrade_150', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.2') {

-        add_action('init', 'geodir_upgrade_152', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.2') {

+		add_action('init', 'geodir_upgrade_152', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.3') {

-        add_action('init', 'geodir_upgrade_153', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.3') {

+		add_action('init', 'geodir_upgrade_153', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.4') {

-        add_action('init', 'geodir_upgrade_154', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.4') {

+		add_action('init', 'geodir_upgrade_154', 11);

+	}

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+	add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+	update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -62,9 +62,9 @@ 
  */

 function geodirectory_upgrade_all()

 {

-    geodir_create_tables();

-    geodir_update_review_db();

-    gd_install_theme_compat();

+	geodir_create_tables();

+	geodir_update_review_db();

+	gd_install_theme_compat();

 }

 

 /**

@@ -75,7 +75,7 @@ 
  */

 function geodir_upgrade_136()

 {

-    geodir_fix_review_overall_rating();

+	geodir_fix_review_overall_rating();

 }

 

 /**

@@ -85,7 +85,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_146(){

-    gd_convert_virtual_pages();

+	gd_convert_virtual_pages();

 }

 

 /**

@@ -95,7 +95,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_150(){

-    gd_fix_cpt_rewrite_slug();

+	gd_fix_cpt_rewrite_slug();

 }

 

 

@@ -107,11 +107,11 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_148(){

-    /*

+	/*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+	update_option('geodir_ga_pass','');

+	update_option('geodir_ga_user','');

 

 }

 

@@ -123,8 +123,8 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_153(){

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

 

 /**

@@ -134,7 +134,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_154(){

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

 /**

@@ -144,7 +144,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_152(){

-    gd_fix_address_detail_table_limit();

+	gd_fix_address_detail_table_limit();

 }

 

 

@@ -158,12 +158,12 @@ 
  */

 function geodir_update_review_db()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    geodir_fix_review_date();

-    geodir_fix_review_post_status();

-    geodir_fix_review_content();

-    geodir_fix_review_location();

+	geodir_fix_review_date();

+	geodir_fix_review_post_status();

+	geodir_fix_review_content();

+	geodir_fix_review_location();

 

 }

 

@@ -176,8 +176,8 @@ 
  */

 function geodir_fix_review_date()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -189,8 +189,8 @@ 
  */

 function geodir_fix_review_post_status()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -203,12 +203,12 @@ 
  */

 function geodir_fix_review_content()

 {

-    global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb;

+	if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -221,20 +221,20 @@ 
  */

 function geodir_fix_review_location()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+			$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

-        }

-        return true;

-    }

-    return false;

+		}

+		return true;

+	}

+	return false;

 }

 

 /**

@@ -246,25 +246,25 @@ 
  */

 function geodir_fix_review_overall_rating()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

 

-            if (!empty($reviews)) {

-                foreach ($reviews as $post_id) {

-                    geodir_update_postrating($post_id->post_id, $key);

-                }

+			if (!empty($reviews)) {

+				foreach ($reviews as $post_id) {

+					geodir_update_postrating($post_id->post_id, $key);

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 }

 

 

@@ -281,367 +281,367 @@ 
  */

 function gd_install_theme_compat()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $theme_compat = array();

-    $theme_compat = get_option('gd_theme_compats');

+	$theme_compat = array();

+	$theme_compat = get_option('gd_theme_compats');

 //GDF

-    $theme_compat['GeoDirectory_Framework'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['GeoDirectory_Framework'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Directory Theme

-    $theme_compat['Directory_Starter'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['Directory_Starter'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Jobby

-    $theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

+	$theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

 

 //GeoProperty

-    $theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

+	$theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

 

 //Avada

-    $theme_compat['Avada'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<!-- removed -->',

-        'geodir_wrapper_close_replace' => '<!-- removed -->',

-        'geodir_wrapper_content_open_id' => 'content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Avada'

-    );

+	$theme_compat['Avada'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<!-- removed -->',

+		'geodir_wrapper_close_replace' => '<!-- removed -->',

+		'geodir_wrapper_content_open_id' => 'content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Avada'

+	);

 

 //Enfold

-    $theme_compat['Enfold'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '</div></main>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Enfold'

-    );

+	$theme_compat['Enfold'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '</div></main>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Enfold'

+	);

 

 // X

-    $theme_compat['X'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'X'

-    );

+	$theme_compat['X'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'X'

+	);

 

 // Divi

-    $theme_compat['Divi'] = array(

-        'geodir_wrapper_open_id' => 'main-content',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => 'left-area',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'sidebar',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_sidebar_left_open_id' => 'sidebar',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{margin:0 auto;width:1080px}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}@media only screen and ( max-width: 980px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:690px}}@media only screen and ( max-width: 767px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:400px}}@media only screen and ( max-width: 479px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:280px}}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Divi'

-    );

+	$theme_compat['Divi'] = array(

+		'geodir_wrapper_open_id' => 'main-content',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => 'left-area',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'sidebar',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_sidebar_left_open_id' => 'sidebar',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{margin:0 auto;width:1080px}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}@media only screen and ( max-width: 980px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:690px}}@media only screen and ( max-width: 767px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:400px}}@media only screen and ( max-width: 479px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:280px}}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Divi'

+	);

 

 // Genesis

-    $theme_compat['Genesis'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'content-sidebar-wrap',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => 'content',

-        'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

-        'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Genesis'

-    );

+	$theme_compat['Genesis'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'content-sidebar-wrap',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => 'content',

+		'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

+		'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Genesis'

+	);

 

 // Jupiter

-    $theme_compat['Jupiter'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

-        'geodir_wrapper_close_replace' => '</div></div></div>',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'mk-sidebar',

-        'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => 'mk-sidebar',

-        'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

-        'geodir_after_title_filter' => '',

-        'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => 'menu-item-link',

-        'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

-        'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Jupiter'

-    );

+	$theme_compat['Jupiter'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

+		'geodir_wrapper_close_replace' => '</div></div></div>',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'mk-sidebar',

+		'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => 'mk-sidebar',

+		'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

+		'geodir_after_title_filter' => '',

+		'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => 'menu-item-link',

+		'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

+		'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Jupiter'

+	);

 

 // Multi News

-    $theme_compat['Multi_News'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'main-container clearfix',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

-        'geodir_wrapper_content_close_replace' => '</div></div></div>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

-        'geodir_main_content_close_replace' => '</div>',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_full_page_class_filter' => 'section full-width-section',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<div class="widget-title"><h2>',

-        'geodir_after_title_filter' => '</h2></div>',

-        'geodir_menu_li_class_filter' => '',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => '',

-        'geodir_sub_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => '',

-        'geodir_location_switcher_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

-        'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Multi_News'

-    );

-

-    update_option('gd_theme_compats', $theme_compat);

-

-    gd_set_theme_compat();// set the compat pack if avail

+	$theme_compat['Multi_News'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'main-container clearfix',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

+		'geodir_wrapper_content_close_replace' => '</div></div></div>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

+		'geodir_main_content_close_replace' => '</div>',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_full_page_class_filter' => 'section full-width-section',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<div class="widget-title"><h2>',

+		'geodir_after_title_filter' => '</h2></div>',

+		'geodir_menu_li_class_filter' => '',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => '',

+		'geodir_sub_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => '',

+		'geodir_location_switcher_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

+		'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Multi_News'

+	);

+

+	update_option('gd_theme_compats', $theme_compat);

+

+	gd_set_theme_compat();// set the compat pack if avail

 }

 

 

@@ -653,61 +653,61 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function gd_convert_virtual_pages(){

-    global $wpdb;

-

-    // Update the add listing page settings

-    $add_listing_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('add-listing')

-        )

-    );

-

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

-    }

-

-    // Update the listing preview page settings

-    $listing_preview_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-preview')

-        )

-    );

-

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

-    }

-

-    // Update the listing success page settings

-    $listing_success_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-success')

-        )

-    );

-

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

-    }

-

-    // Update the listing success page settings

-    $location_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('location')

-        )

-    );

-

-    if($location_page){

-        $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

-    }

+	global $wpdb;

+

+	// Update the add listing page settings

+	$add_listing_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('add-listing')

+		)

+	);

+

+	if($add_listing_page){

+		wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

+		update_option( 'geodir_add_listing_page', $add_listing_page);

+	}

+

+	// Update the listing preview page settings

+	$listing_preview_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-preview')

+		)

+	);

+

+	if($listing_preview_page){

+		wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

+		update_option( 'geodir_preview_page', $listing_preview_page);

+	}

+

+	// Update the listing success page settings

+	$listing_success_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-success')

+		)

+	);

+

+	if($listing_success_page){

+		wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

+		update_option( 'geodir_success_page', $listing_success_page);

+	}

+

+	// Update the listing success page settings

+	$location_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('location')

+		)

+	);

+

+	if($location_page){

+		$location_slug = get_option('geodir_location_prefix');

+		if(!$location_slug ){$location_slug  = 'location';}

+		wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

+		update_option( 'geodir_location_page', $location_page);

+	}

 

 }

 

@@ -721,31 +721,31 @@ 
 function gd_fix_cpt_rewrite_slug()

 {

 

-    $alt_post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$alt_post_types = array();

+	$post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+	if (is_array($post_types)){

 

-        foreach ($post_types as $post_type => $args) {

+		foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

-            }

+			if(isset($args['rewrite']['slug'])){

+				$args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+			}

 

-                $alt_post_types[$post_type] = $args;

+				$alt_post_types[$post_type] = $args;

 

-        }

-    }

+		}

+	}

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

-        }

+	if(!empty($alt_post_types)) {

+		update_option('geodir_post_types',$alt_post_types);

+		}

 

 

-    // flush the rewrite rules

-    flush_rewrite_rules();

+	// flush the rewrite rules

+	flush_rewrite_rules();

 }

 

 

@@ -758,18 +758,18 @@ 
  */

 function gd_fix_address_detail_table_limit()

 {

-    global $wpdb;

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

-            }

-        }

-    }

+	global $wpdb;

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			try {

+				$wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+			} catch(Exception $e) {

+				error_log( 'Error: ' . $e->getMessage() );

+			}

+		}

+	}

 }

Spacing +43 added lines, -43 removed lines

@@ -9,7 +9,7 @@ 
 

 global $wpdb;

 

-if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

+if (get_option('geodirectory'.'_db_version') != GEODIRECTORY_VERSION) {

     /**

      * Include custom database table related functions.

      *

@@ -47,9 +47,9 @@ 
     }

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+    update_option('geodirectory'.'_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -84,7 +84,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -94,7 +94,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -106,12 +106,12 @@ 
  * @since 1.4.8

  * @package GeoDirectory

  */

-function geodir_upgrade_148(){

+function geodir_upgrade_148() {

     /*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+    update_option('geodir_ga_pass', '');

+    update_option('geodir_ga_user', '');

 

 }

 

@@ -122,7 +122,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_153(){

+function geodir_upgrade_153() {

     geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

     geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

@@ -133,7 +133,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_154(){

+function geodir_upgrade_154() {

     geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

@@ -143,7 +143,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -177,7 +177,7 @@ 
 function geodir_fix_review_date()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -190,7 +190,7 @@ 
 function geodir_fix_review_post_status()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -204,7 +204,7 @@ 
 function geodir_fix_review_content()

 {

     global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+    if ($wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

         return true;

     } else {

         return false;

@@ -229,7 +229,7 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+            $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN ".$wpdb->prefix."geodir_".$key."_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

         }

         return true;

@@ -253,7 +253,7 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+            $reviews = $wpdb->get_results("SELECT post_id FROM ".$wpdb->prefix."geodir_".$key."_detail d");

 

             if (!empty($reviews)) {

                 foreach ($reviews as $post_id) {

@@ -641,7 +641,7 @@ 
 

     update_option('gd_theme_compats', $theme_compat);

 

-    gd_set_theme_compat();// set the compat pack if avail

+    gd_set_theme_compat(); // set the compat pack if avail

 }

 

 

@@ -652,61 +652,61 @@ 
  * @package GeoDirectory

  * @global object $wpdb WordPress Database object.

  */

-function gd_convert_virtual_pages(){

+function gd_convert_virtual_pages() {

     global $wpdb;

 

     // Update the add listing page settings

     $add_listing_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('add-listing')

         )

     );

 

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

+    if ($add_listing_page) {

+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));

+        update_option('geodir_add_listing_page', $add_listing_page);

     }

 

     // Update the listing preview page settings

     $listing_preview_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-preview')

         )

     );

 

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

+    if ($listing_preview_page) {

+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));

+        update_option('geodir_preview_page', $listing_preview_page);

     }

 

     // Update the listing success page settings

     $listing_success_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-success')

         )

     );

 

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

+    if ($listing_success_page) {

+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));

+        update_option('geodir_success_page', $listing_success_page);

     }

 

     // Update the listing success page settings

     $location_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('location')

         )

     );

 

-    if($location_page){

+    if ($location_page) {

         $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

+        if (!$location_slug) {$location_slug = 'location'; }

+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));

+        update_option('geodir_location_page', $location_page);

     }

 

 }

@@ -725,13 +725,13 @@ 
     $post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+    if (is_array($post_types)) {

 

         foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+            if (isset($args['rewrite']['slug'])) {

+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);

             }

 

                 $alt_post_types[$post_type] = $args;

@@ -739,8 +739,8 @@ 
         }

     }

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

+    if (!empty($alt_post_types)) {

+        update_option('geodir_post_types', $alt_post_types);

         }

 

 

@@ -766,9 +766,9 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

             try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

+                $wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_".$key."_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+            } catch (Exception $e) {

+                error_log('Error: '.$e->getMessage());

             }

         }

     }

geodirectory-templates/popup-forms.php

Indentation +76 added lines, -76 removed lines

@@ -29,23 +29,23 @@ 
             <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send to friend popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
-                 */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+				/**
+				 * Filter the title for the send to friend popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
+				 */
+				echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+			/**
+			 * Called before each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_stf_form_field', 'to_name');?>
             <div class="row clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Friend Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -54,16 +54,16 @@ 
                     <span class="message_error2" id="to_nameInfo"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+			/**
+			 * Called after each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_stf_form_field', 'to_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'to_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -72,11 +72,11 @@ 
                     <span class="message_error2" id="to_emailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'to_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'yourname');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Your Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -85,11 +85,11 @@ 
                     <span class="message_error2" id="yournameInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'yourname');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'youremail');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -98,11 +98,11 @@ 
                     <span class="message_error2" id="youremailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'youremail');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_subject');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Subject', 'geodirectory');?> : <span>*</span></label></div>
@@ -113,11 +113,11 @@ 
                     <span class="message_error2" id="frnd_subjectInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_subject');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_comments');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -127,11 +127,11 @@ 
                     <span class="message_error2" id="frnd_commentsInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_comments');?>
             <?php if (function_exists('geodir_get_captch')) {
-                geodir_get_captch('-1');
-            }?>
+				geodir_get_captch('-1');
+			}?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory')?> " class="button "/>
         </form>
     </div> <?php
@@ -145,23 +145,23 @@ 
             <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send inquiry popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
-                 */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+				/**
+				 * Filter the title for the send inquiry popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
+				 */
+				echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called before each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_inquiry_form_field', 'inq_name');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading"><label><?php _e('Your Name', 'geodirectory');?> :
                         <span>*</span></label></div>
@@ -170,16 +170,16 @@ 
                     <span class="message_error2" id="span_agt_mail_name"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called after each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_inquiry_form_field', 'inq_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -189,11 +189,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Contact Info', 'geodirectory');?> :</label></div>
@@ -202,11 +202,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -216,8 +216,8 @@ 
                     <span class="message_error2" id="span_agt_mail_msg"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
                    class="button clearfix"/>
         </form>

Spacing +37 added lines, -37 removed lines

@@ -19,14 +19,14 @@ 
  * @param int $post_id The post id requested by the popup.
  * @param object $post_info The post object requested by the popup.
  */
-do_action('geodir_popup_forms_template_start',$post_id,$post_info);
+do_action('geodir_popup_forms_template_start', $post_id, $post_info);
 
 if ($_REQUEST['popuptype'] == 'b_sendtofriend') { ?>
 
     <div id="basic-modal-content" class="clearfix">
         <form name="send_to_frnd" id="send_to_frnd" action="<?php echo get_permalink($post_info->ID); ?>" method="post">
             <input type="hidden" name="sendact" value="email_frnd"/>
-            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -35,7 +35,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
                  */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND); ?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -45,9 +45,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+            do_action('geodir_before_stf_form_field', 'to_name'); ?>
             <div class="row clearfix">
-                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -56,55 +56,55 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+            do_action('geodir_after_stf_form_field', 'to_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+            do_action('geodir_before_stf_form_field', 'to_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+            do_action('geodir_after_stf_form_field', 'to_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+            do_action('geodir_before_stf_form_field', 'yourname'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+            do_action('geodir_after_stf_form_field', 'yourname'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+            do_action('geodir_before_stf_form_field', 'youremail'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+            do_action('geodir_after_stf_form_field', 'youremail'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_before_stf_form_field', 'frnd_subject'); ?>
             <div class="row  clearfix">
                     <input required field_type="text" name="frnd_subject"
-                           value="<?php echo __('About', 'geodirectory') . ' ' . $post_info->post_title;?>"
-                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory');?>"/>
+                           value="<?php echo __('About', 'geodirectory').' '.$post_info->post_title; ?>"
+                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_after_stf_form_field', 'frnd_subject'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_before_stf_form_field', 'frnd_comments'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="frnd_comments" id="frnd_comments" cols=""
-                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?></textarea>
+                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_after_stf_form_field', 'frnd_comments'); ?>
             <?php if (function_exists('geodir_get_captch')) {
                 geodir_get_captch('-1');
             }?>
@@ -118,7 +118,7 @@ 
         <form method="post" name="agt_mail_agent" id="agt_mail_agent"
               action="<?php echo get_permalink($post_info->ID); ?>">
             <input type="hidden" name="sendact" value="send_inqury"/>
-            <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -127,7 +127,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
                  */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY); ?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -137,9 +137,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_name'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -148,36 +148,36 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_phone'); ?>
             <div class="row  clearfix">
-                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory');?>"/>
+                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_phone'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_msg'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="inq_msg" cols=""
-                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT;?>"></textarea>
+                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT; ?>"></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
-            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
+            do_action('geodir_after_inquiry_form_field', 'inq_msg'); ?>
+            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory'); ?>"
                    class="button clearfix"/>
         </form>
     </div> <?php

geodirectory-templates/add-listing.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 global $gd_session;
 
 if (!isset($_REQUEST['backandedit'])) {
-    $gd_session->un_set('listing');
+	$gd_session->un_set('listing');
 }
 // call header
 get_header();

geodirectory-templates/reg_frm.php

Indentation +39 added lines, -39 removed lines

@@ -9,13 +9,13 @@ 
  * @package GeoDirectory

  */

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 }

 ?>

 <div id="sign_up">

@@ -26,28 +26,28 @@ 
         <h4>

             <?php

 

-            /**

-             * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

+			/**

+			 * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

 

-            ?>

+			?>

         </h4>

         <?php

-        global $geodir_signup_error;

-        if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

-            unset($geodir_signup_error);

-        } else {

-            if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

-            } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

-            }

-        }

-        ?>

+		global $geodir_signup_error;

+		if ($geodir_signup_error != '') {

+			echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+			unset($geodir_signup_error);

+		} else {

+			if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

+				echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+			} else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

+				echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+			}

+		}

+		?>

 

         <form name="cus_registerform" id="cus_registerform"

               action="<?php echo htmlspecialchars(geodir_curPageURL()); ?>" method="post">

@@ -57,10 +57,10 @@ 
             <div class="form_row clearfix">

                 <input placeholder='<?php echo EMAIL_TEXT; ?>' type="text" name="user_email" id="user_email"

                        class="textfield" value="<?php global $user_email;

-                if (!isset($user_email)) {

-                    $user_email = '';

-                }

-                echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

+				if (!isset($user_email)) {

+					$user_email = '';

+				}

+				echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

 

                 <?php if (!get_option('geodir_allow_cpass')) { ?>

 				<div id="reg_passmail">

@@ -74,8 +74,8 @@ 
                 <div class="form_row clearfix">

                     <input placeholder='<?php echo FIRST_NAME_TEXT; ?>' type="text" name="user_fname" id="user_fname"

                            class="textfield" value="<?php if (isset($user_fname)) {

-                        echo esc_attr(stripslashes($user_fname));

-                    } ?>" size="25"/>

+						echo esc_attr(stripslashes($user_fname));

+					} ?>" size="25"/>

                     <span id="user_fnameInfo"></span>

                 </div>

             </div>

@@ -101,14 +101,14 @@ 
             <?php } ?>

 

             <?php

-            /**

-             * Called just before the register new user button on the register form template.

-             *

-             * Also used by other plugins to add social connect buttons.

-             *

-             * @since 1.0.0

-             */

-            do_action('social_connect_form'); ?>

+			/**

+			 * Called just before the register new user button on the register form template.

+			 *

+			 * Also used by other plugins to add social connect buttons.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('social_connect_form'); ?>

             <input type="submit" name="registernow" value="<?php echo REGISTER_NOW_TEXT; ?>" class="geodir_button"/>

         </form>

     </div>

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
         <?php

         global $geodir_signup_error;

         if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+            echo '<p class="error_msg">'.$geodir_signup_error.'</p>';

             unset($geodir_signup_error);

         } else {

             if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+                echo '<p class="error_msg">'.EMAIL_USERNAME_EXIST_MSG.'</p>';

             } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+                echo '<p class="error_msg">'.REGISTRATION_DESABLED_MSG.'</p>';

             }

         }

         ?>

geodirectory.php

Braces +27 added lines, -9 removed lines

@@ -76,29 +76,45 @@ 
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+	define('WP_POST_REVISIONS', 0);
+}
 

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 

 if ($_SERVER['REQUEST_URI'] == '' || $_SERVER['REQUEST_URI'] == '/') {

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

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'plugins_loaded', 'geodir_load_textdomain' );

Indentation +79 added lines, -79 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -122,19 +122,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -173,61 +173,61 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-    register_uninstall_hook(__FILE__, 'geodir_uninstall');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+	register_uninstall_hook(__FILE__, 'geodir_uninstall');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

+	global $pagenow;

    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }

Spacing +24 added lines, -24 removed lines

@@ -34,7 +34,7 @@ 
     /**

      * Include WordPress core file so we can use core functions to check for active plugins.

      */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+    include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

@@ -68,8 +68,8 @@ 
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.

  */

 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;

-$plugin_prefix = $wpdb->prefix . 'geodir_';

-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);

+$plugin_prefix = $wpdb->prefix.'geodir_';

+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);

 

 /*

  * This will store the cached post custom fields per package for each page load so not to run for each listing.

@@ -84,24 +84,24 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');

 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');

 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');

 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');

 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');

 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');

 

 

 /*

@@ -110,7 +110,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'init', 'geodir_load_textdomain' );

+add_action('init', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -121,18 +121,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -171,7 +171,7 @@ 
 /*

  * Admin init + activation hooks

  */

-if (is_admin() || defined( 'GD_TESTING_MODE' )) {

+if (is_admin() || defined('GD_TESTING_MODE')) {

 

     /**

      * Include functions used in admin area only.

@@ -196,14 +196,14 @@ 
      *

      * @since 1.0.0

      */

-    require_once(geodir_plugin_path() . '/upgrade.php');

+    require_once(geodir_plugin_path().'/upgrade.php');

     if (get_option('geodir_installed') != 1) {

         /**

          * Define language constants, here as they are not loaded yet.

          *

          * @since 1.0.0

          */

-        require_once(geodir_plugin_path() . '/language.php');

+        require_once(geodir_plugin_path().'/language.php');

         /**

          * Include the plugin install file that sets up the databases and any options on first run.

          *

@@ -221,13 +221,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

-   if ( 'plugins.php' === $pagenow )

+   if ('plugins.php' === $pagenow)

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }

geodirectory-functions/map-functions/map_functions.php

Braces +3 added lines, -2 removed lines

@@ -235,8 +235,9 @@
 

         return $out;

     } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

+        if ($cat_parent == 0) {
+                    return _e('No category', 'geodirectory');
+        }
     }

     return;

 }

Spacing +24 added lines, -24 removed lines

@@ -64,7 +64,7 @@ 
         $title = str_replace($srcharr, $replarr, $post_title);

 

         if (is_ssl()) {

-            $icon = str_replace("http:","https:",$icon );

+            $icon = str_replace("http:", "https:", $icon);

         }

         

         if ($icon != '') {

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

         }

 

-        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';

+        $post_json = '{"id":"'.$post->ID.'","t": "'.$title.'","lt": "'.$post->post_latitude.'","ln": "'.$post->post_longitude.'","mk_id":"'.$post->ID.'_'.$post->default_category.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"}';

 

         /**

          * Filter the json data when creating output for post json marker..

@@ -89,7 +89,7 @@ 
          * @param string $post_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);

     }

 }

 

@@ -109,7 +109,7 @@ 
         foreach ($map_canvas_arr as $canvas => $jason) {

             if (is_array($map_jason) && !empty($map_jason)) {

 

-                $canvas_jason = $canvas . "_jason";

+                $canvas_jason = $canvas."_jason";

                 $map_canvas_arr[$canvas] = array_unique($map_jason);

                 unset($cat_content_info);

                 $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

@@ -117,12 +117,12 @@ 
                 if (!empty($cat_content_info)) {

                     $json_content = substr(implode(',', $cat_content_info), 1);

                     $json_content = htmlentities($json_content, ENT_QUOTES); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+                    $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';

                 } else {

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

                 }

 

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);

 

                 /**

                  * Filter the send_marker_jason_to_js() function map canvas json args.

@@ -134,12 +134,12 @@ 
                  * @param string $canvas Map canvas array key.

                  * @param array $map_canvas_jason_args Map canvas args.

                  */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);

 

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);

             } else {

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

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);

 

                 /**

                  * Filter the send_marker_jason_to_js() function map canvas json args.

@@ -151,8 +151,8 @@ 
                  * @param string $canvas Map canvas array key.

                  * @param array $map_canvas_jason_args Map canvas args.

                  */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);

+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);

             }

         }

 

@@ -214,11 +214,11 @@ 
         }

 

 

-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+        $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">';

 

         $geodir_cat_icons = geodir_get_term_icon();

 

-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

+        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';

         $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : $geodir_default_map_search_pt;

         foreach ($cat_terms as $cat_term):

 

@@ -232,16 +232,16 @@ 
 

                 // Untick the category by default on home map

                 if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->term_id, $geodir_home_map_untick)) {

+                    if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$cat_term->term_id, $geodir_home_map_untick)) {

                         $checked = '';

                     }

                 }

 

-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

-                $term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

+                $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"';

+                $term_check .= ' name="'.$map_canvas_name.'_cat[]" ';

+                $term_check .= '  title="'.esc_attr(ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">';

+                $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.ucfirst($cat_term->name).'"/>';

+                $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>';

 

             endif;

 

@@ -353,11 +353,11 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_style() {    

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

-    document.write('<' + 'link id="geodirectory-leaflet-style-css" media="all" type="text/css" href="<?php echo geodir_plugin_url();?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>" rel="stylesheet"' + '>');

+    document.write('<' + 'link id="geodirectory-leaflet-style-css" media="all" type="text/css" href="<?php echo geodir_plugin_url(); ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>" rel="stylesheet"' + '>');

 }

 </script>

 <?php

@@ -373,12 +373,12 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

-    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo geodir_plugin_url();?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

-    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo geodir_plugin_url();?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo geodir_plugin_url(); ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo geodir_plugin_url(); ?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

 }

 </script>

 <?php

Indentation +197 added lines, -197 removed lines

@@ -15,8 +15,8 @@ 
  */

 function  geodir_init_map_jason()

 {

-    global $map_jason;

-    $map_jason = array();

+	global $map_jason;

+	$map_jason = array();

 }

 

 /**

@@ -28,8 +28,8 @@ 
  */

 function geodir_init_map_canvas_array()

 {

-    global $map_canvas_arr;

-    $map_canvas_arr = array();

+	global $map_canvas_arr;

+	$map_canvas_arr = array();

 }

 

 

@@ -50,47 +50,47 @@ 
  */

 function create_marker_jason_of_posts($post)

 {

-    global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;

+	global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;

 

-    if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

-        $srcharr = array("'", "/", "-", '"', '\\');

-        $replarr = array("′", "⁄", "–", "“", '');

+	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

+		$srcharr = array("'", "/", "-", '"', '\\');

+		$replarr = array("′", "⁄", "–", "“", '');

 

 

-        $geodir_cat_icons = geodir_get_term_icon();

-        $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';

+		$geodir_cat_icons = geodir_get_term_icon();

+		$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';

 

-        $post_title = $post->post_title;

-        $title = str_replace($srcharr, $replarr, $post_title);

+		$post_title = $post->post_title;

+		$title = str_replace($srcharr, $replarr, $post_title);

 

-        if (is_ssl()) {

-            $icon = str_replace("http:","https:",$icon );

-        }

+		if (is_ssl()) {

+			$icon = str_replace("http:","https:",$icon );

+		}

         

-        if ($icon != '') {

-            $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

+		if ($icon != '') {

+			$gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;

             

-            if (isset($gd_marker_sizes[$icon])) {

-                $icon_size = $gd_marker_sizes[$icon];

-            } else {

-                $icon_size = geodir_get_marker_size($icon);

-                $gd_marker_sizes[$icon] = $icon_size;

-            }               

-        } else {

-            $icon_size = array('w' => 36, 'h' => 45);

-        }

-

-        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';

-

-        /**

-         * Filter the json data when creating output for post json marker..

-         *

-         * @since 1.5.7

-         * @param string $post_json JSON representation of the post marker info.

-         * @param object $post The post object.

-         */

-        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

-    }

+			if (isset($gd_marker_sizes[$icon])) {

+				$icon_size = $gd_marker_sizes[$icon];

+			} else {

+				$icon_size = geodir_get_marker_size($icon);

+				$gd_marker_sizes[$icon] = $icon_size;

+			}               

+		} else {

+			$icon_size = array('w' => 36, 'h' => 45);

+		}

+

+		$post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';

+

+		/**

+		 * Filter the json data when creating output for post json marker..

+		 *

+		 * @since 1.5.7

+		 * @param string $post_json JSON representation of the post marker info.

+		 * @param object $post The post object.

+		 */

+		$map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+	}

 }

 

 /**

@@ -103,59 +103,59 @@ 
  */

 function send_marker_jason_to_js()

 {

-    global $map_jason, $map_canvas_arr;

-

-    if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {

-        foreach ($map_canvas_arr as $canvas => $jason) {

-            if (is_array($map_jason) && !empty($map_jason)) {

-                $canvas_jason = $canvas . "_jason";

-                $map_canvas_arr[$canvas] = array_unique($map_jason);

-                unset($cat_content_info);

-                $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

-                $totalcount = count(array_unique($map_jason));

-                if (!empty($cat_content_info)) {

-                    $json_content = substr(implode(',', $cat_content_info), 1);

-                    $json_content = htmlentities($json_content, ENT_QUOTES); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

-                } else {

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

-                }

-

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

-

-                /**

-                 * Filter the send_marker_jason_to_js() function map canvas json args.

-                 *

-                 * You can use this filter to modify map canvas json args.

-                 *

-                 * @since 1.0.0

-                 * @package GeoDirectory

-                 * @param string $canvas Map canvas array key.

-                 * @param array $map_canvas_jason_args Map canvas args.

-                 */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

-            } else {

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

-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

-

-                /**

-                 * Filter the send_marker_jason_to_js() function map canvas json args.

-                 *

-                 * You can use this filter to modify map canvas json args.

-                 *

-                 * @since 1.0.0

-                 * @package GeoDirectory

-                 * @param string $canvas Map canvas array key.

-                 * @param array $map_canvas_jason_args Map canvas args.

-                 */

-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

-            }

-        }

-

-    }

+	global $map_jason, $map_canvas_arr;

+

+	if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {

+		foreach ($map_canvas_arr as $canvas => $jason) {

+			if (is_array($map_jason) && !empty($map_jason)) {

+				$canvas_jason = $canvas . "_jason";

+				$map_canvas_arr[$canvas] = array_unique($map_jason);

+				unset($cat_content_info);

+				$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

+				$totalcount = count(array_unique($map_jason));

+				if (!empty($cat_content_info)) {

+					$json_content = substr(implode(',', $cat_content_info), 1);

+					$json_content = htmlentities($json_content, ENT_QUOTES); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

+					$canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+				} else {

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

+				}

+

+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+

+				/**

+				 * Filter the send_marker_jason_to_js() function map canvas json args.

+				 *

+				 * You can use this filter to modify map canvas json args.

+				 *

+				 * @since 1.0.0

+				 * @package GeoDirectory

+				 * @param string $canvas Map canvas array key.

+				 * @param array $map_canvas_jason_args Map canvas args.

+				 */

+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+

+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+			} else {

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

+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

+

+				/**

+				 * Filter the send_marker_jason_to_js() function map canvas json args.

+				 *

+				 * You can use this filter to modify map canvas json args.

+				 *

+				 * @since 1.0.0

+				 * @package GeoDirectory

+				 * @param string $canvas Map canvas array key.

+				 * @param array $map_canvas_jason_args Map canvas args.

+				 */

+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);

+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);

+			}

+		}

+

+	}

 }

 

 /**

@@ -174,92 +174,92 @@ 
  */

 function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false)

 {

-    global $cat_count, $geodir_cat_icons;

+	global $cat_count, $geodir_cat_icons;

 

-    $exclude_categories = get_option('geodir_exclude_cat_on_map');

-    $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');

+	$exclude_categories = get_option('geodir_exclude_cat_on_map');

+	$exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');

 

-    // check if exclude categories saved before fix of categories identical names

-    if ($exclude_categories_new) {

-        $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';

-        $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();

-    }

+	// check if exclude categories saved before fix of categories identical names

+	if ($exclude_categories_new) {

+		$gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';

+		$exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();

+	}

 

-    $exclude_cat_str = implode(',', $exclude_categories);

+	$exclude_cat_str = implode(',', $exclude_categories);

 

-    if ($exclude_cat_str == '') {

-        $exclude_cat_str = '0';

-    }

+	if ($exclude_cat_str == '') {

+		$exclude_cat_str = '0';

+	}

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));

 

-    if ($hide_empty) {

-        $cat_terms = geodir_filter_empty_terms($cat_terms);

-    }

+	if ($hide_empty) {

+		$cat_terms = geodir_filter_empty_terms($cat_terms);

+	}

 

-    $main_list_class = '';

-    //If there are terms, start displaying

-    if (count($cat_terms) > 0) {

-        //Displaying as a list

-        $p = $pading * 15;

-        $pading++;

+	$main_list_class = '';

+	//If there are terms, start displaying

+	if (count($cat_terms) > 0) {

+		//Displaying as a list

+		$p = $pading * 15;

+		$pading++;

 

-        if ($cat_parent == 0) {

-            $list_class = 'main_list';

-            $display = '';

-        } else {

-            $list_class = 'sub_list';

-            $display = !$child_collapse ? '' : 'display:none';

-        }

+		if ($cat_parent == 0) {

+			$list_class = 'main_list';

+			$display = '';

+		} else {

+			$list_class = 'sub_list';

+			$display = !$child_collapse ? '' : 'display:none';

+		}

 

 

-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+		$out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';

 

-        $geodir_cat_icons = geodir_get_term_icon();

+		$geodir_cat_icons = geodir_get_term_icon();

 

-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

-        $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : $geodir_default_map_search_pt;

-        foreach ($cat_terms as $cat_term):

+		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

+		$post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : $geodir_default_map_search_pt;

+		foreach ($cat_terms as $cat_term):

 

 

 

-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';

+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';

 

-            if (!in_array($cat_term->term_id, $exclude_categories)):

-                //Secret sauce.  Function calls itself to display child elements, if any

-                $checked = 'checked="checked"';

+			if (!in_array($cat_term->term_id, $exclude_categories)):

+				//Secret sauce.  Function calls itself to display child elements, if any

+				$checked = 'checked="checked"';

 

-                // Untick the category by default on home map

-                if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->term_id, $geodir_home_map_untick)) {

-                        $checked = '';

-                    }

-                }

+				// Untick the category by default on home map

+				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

+					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->term_id, $geodir_home_map_untick)) {

+						$checked = '';

+					}

+				}

 

-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

-                $term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

+				$term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

+				$term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

+				$term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

+				$term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';

+				$out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

 

-            endif;

+			endif;

 

 

-            // get sub category by recursion

-            $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);

+			// get sub category by recursion

+			$out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);

 

-            $out .= '</li>';

+			$out .= '</li>';

 

-        endforeach;

+		endforeach;

 

-        $out .= '</ul>';

+		$out .= '</ul>';

 

-        return $out;

-    } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

-    }

-    return;

+		return $out;

+	} else {

+		if ($cat_parent == 0)

+			return _e('No category', 'geodirectory');

+	}

+	return;

 }

 

 /**

@@ -271,19 +271,19 @@ 
  * @return string The map API provider name.

  */

 function geodir_map_name() {

-    $geodir_map_name = get_option('geodir_load_map', 'google');

+	$geodir_map_name = get_option('geodir_load_map', 'google');

     

-    if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {

-        $geodir_map_name = 'auto';

-    }

-

-    /**

-     * Filter the map JS API provider name.

-     *

-     * @since 1.6.1

-     * @param string $geodir_map_name The map API provider name.

-     */

-    return apply_filters('geodir_map_name', $geodir_map_name);

+	if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {

+		$geodir_map_name = 'auto';

+	}

+

+	/**

+	 * Filter the map JS API provider name.

+	 *

+	 * @since 1.6.1

+	 * @param string $geodir_map_name The map API provider name.

+	 */

+	return apply_filters('geodir_map_name', $geodir_map_name);

 }

 

 /**

@@ -299,48 +299,48 @@ 
  * @return array The icon size.

  */

 function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {

-    global $gd_marker_sizes;

+	global $gd_marker_sizes;

     

-    if (empty($gd_marker_sizes)) {

-        $gd_marker_sizes = array();

-    }

+	if (empty($gd_marker_sizes)) {

+		$gd_marker_sizes = array();

+	}

       

-    if (!empty($gd_marker_sizes[$icon])) {

-        return $gd_marker_sizes[$icon];

-    }

+	if (!empty($gd_marker_sizes[$icon])) {

+		return $gd_marker_sizes[$icon];

+	}

     

-    if (empty($icon)) {

-        $gd_marker_sizes[$icon] = $default_size;

+	if (empty($icon)) {

+		$gd_marker_sizes[$icon] = $default_size;

         

-        return $default_size;

-    }

+		return $default_size;

+	}

     

-    $icon_url = $icon;

+	$icon_url = $icon;

     

-    $uploads = wp_upload_dir(); // Array of key => value pairs

+	$uploads = wp_upload_dir(); // Array of key => value pairs

       

-    if (!path_is_absolute($icon)) {

-        $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);

-    }

+	if (!path_is_absolute($icon)) {

+		$icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);

+	}

     

-    if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {

-        $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);

-    }

+	if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {

+		$icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);

+	}

     

-    $sizes = array();

-    if (is_file($icon) && file_exists($icon)) {

-        $size = getimagesize(trim($icon));

+	$sizes = array();

+	if (is_file($icon) && file_exists($icon)) {

+		$size = getimagesize(trim($icon));

         

-        if (!empty($size[0]) && !empty($size[1])) {

-            $sizes = array('w' => $size[0], 'h' => $size[1]);

-        }

-    }

+		if (!empty($size[0]) && !empty($size[1])) {

+			$sizes = array('w' => $size[0], 'h' => $size[1]);

+		}

+	}

     

-    $sizes = !empty($sizes) ? $sizes : $default_size;

+	$sizes = !empty($sizes) ? $sizes : $default_size;

     

-    $gd_marker_sizes[$icon_url] = $sizes;

+	$gd_marker_sizes[$icon_url] = $sizes;

     

-    return $sizes;

+	return $sizes;

 }

 

 add_action('wp_head', 'geodir_map_load_style', 10);

@@ -352,7 +352,7 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_style() {    

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

@@ -360,7 +360,7 @@ 
 }

 </script>

 <?php

-    }

+	}

 }

 

 add_action('wp_footer', 'geodir_map_load_script', 10);

@@ -372,7 +372,7 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

@@ -381,5 +381,5 @@ 
 }

 </script>

 <?php

-    }

+	}

 }
\ No newline at end of file