GeoDirectory / geodirectory

geodirectory-functions/compatibility/Avada.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+    $breadcrumb = str_replace(array("<li>", "</li>"), "", $breadcrumb);
     $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
     $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
     return $breadcrumb;
@@ -39,7 +39,7 @@ 
     return $separator;
 }
 
-add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
+add_action('avada_override_current_page_title_bar', 'gd_avada_current_page_title_bar_change');
 /**
  * new title bar functions for gd pages.
  *
@@ -51,8 +51,8 @@ 
 {
     if (geodir_is_geodir_page()) {
         gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
+    } else {
+        avada_current_page_title_bar($c_pageID);
     }
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Braces +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 
     if(!$cpt_left){
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else{
         $cpt_left = '';
     }
 

Indentation +100 added lines, -100 removed lines

@@ -18,10 +18,10 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
-    $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
-    $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
-    return $breadcrumb;
+	$breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+	$breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
+	$breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
+	return $breadcrumb;
 }
 
 add_filter('geodir_breadcrumb_separator', 'gd_change_breadcrumb_separator');
@@ -35,8 +35,8 @@ 
  */
 function gd_change_breadcrumb_separator($separator)
 {
-    $separator = ' / ';
-    return $separator;
+	$separator = ' / ';
+	return $separator;
 }
 
 add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
@@ -49,11 +49,11 @@ 
  */
 function gd_avada_current_page_title_bar_change($c_pageID)
 {
-    if (geodir_is_geodir_page()) {
-        gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
-    }
+	if (geodir_is_geodir_page()) {
+		gd_avada_current_page_title_bar();
+	}else{
+		avada_current_page_title_bar( $c_pageID );
+	}
 
 }
 
@@ -65,46 +65,46 @@ 
  */
 function gd_avada_current_page_title_bar()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $secondary_content = ob_get_contents();
-    ob_get_clean();
-
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('add-listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_add_listing_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        $title = get_the_title();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
-
-    if (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_search_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
+	ob_start();
+	geodir_breadcrumb();
+	$secondary_content = ob_get_contents();
+	ob_get_clean();
+
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('add-listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_add_listing_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('detail') || geodir_is_page('preview')) {
+		$title = get_the_title();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
+
+	if (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_search_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
 }
 
 /**
@@ -115,34 +115,34 @@ 
  */
 function gd_compat_php_avada()
 {
-    // change widget wrappers
-    //add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
-    //add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
-
-    // 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);
-
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
-
-    //gd_compat_add_top_section_back();
+	// change widget wrappers
+	//add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
+	//add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
+
+	// 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);
+
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+
+	//gd_compat_add_top_section_back();
 
 }
 
@@ -156,17 +156,17 @@ 
 function gd_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 
 
 }
@@ -183,12 +183,12 @@ 
  */
 function gd_compat_body_class($classes)
 {
-    if (geodir_is_geodir_page()) {
-        $classes[] = 'wpgeo-avada';
-    } else {
-        $classes[] = '';
-    }
-    return $classes;
+	if (geodir_is_geodir_page()) {
+		$classes[] = 'wpgeo-avada';
+	} else {
+		$classes[] = '';
+	}
+	return $classes;
 }
 
 
@@ -202,7 +202,7 @@ 
  */
 function geodir_before_widget_compat($var)
 {
-    return '<div id="%1$s" class="geodir-widget %2$s">';
+	return '<div id="%1$s" class="geodir-widget %2$s">';
 }
 
 /**
@@ -215,7 +215,7 @@ 
  */
 function geodir_after_widget_compat($var)
 {
-    return '</div>';
+	return '</div>';
 }
 
 add_filter('geodir_search_form_class', 'geodir_search_form_class_avada');
@@ -229,8 +229,8 @@ 
  */
 function geodir_search_form_class_avada($class)
 {
-    $class .= ' search';
-    return $class;
+	$class .= ' search';
+	return $class;
 }
 
 

geodirectory-functions/google_analytics.php

Braces +6 added lines, -9 removed lines

@@ -76,22 +76,19 @@ 
         if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

         if(!$ga_end){$ga_end = date('Y-m-d');}

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

         if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

         if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

         if(!$ga_start){$ga_start = date('Y')."-01-01";}

         if(!$ga_end){$ga_end = date('Y-m-d');}

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

         if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

         if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

         if(!$ga_start){$ga_start = "14daysAgo";}

         if(!$ga_end){$ga_end = "yesterday";}

         $dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

@@ -144,7 +141,7 @@ 
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else{//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

         if(!$refresh_at){

@@ -167,7 +164,7 @@ 
             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

+        } else{

             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

         }

 

Indentation +124 added lines, -124 removed lines

@@ -17,34 +17,34 @@ 
  */

 function geodir_sec2hms($sec, $padHours = false)

 {

-    // holds formatted string

-    $hms = "";

-    // there are 3600 seconds in an hour, so if we

-    // divide total seconds by 3600 and throw away

-    // the remainder, we've got the number of hours

-    $hours = intval(intval($sec) / 3600);

-

-    // add to $hms, with a leading 0 if asked for

-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

-

-    // dividing the total seconds by 60 will give us

-    // the number of minutes, but we're interested in

-    // minutes past the hour: to get that, we need to

-    // divide by 60 again and keep the remainder

-    $minutes = intval(($sec / 60) % 60);

-

-    // then add to $hms (with a leading 0 if needed)

-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

-

-    // seconds are simple - just divide the total

-    // seconds by 60 and keep the remainder

-    $seconds = intval($sec % 60);

-

-    // add to $hms, again with a leading 0 if needed

-    $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);

-

-    // done!

-    return $hms;

+	// holds formatted string

+	$hms = "";

+	// there are 3600 seconds in an hour, so if we

+	// divide total seconds by 3600 and throw away

+	// the remainder, we've got the number of hours

+	$hours = intval(intval($sec) / 3600);

+

+	// add to $hms, with a leading 0 if asked for

+	$hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

+

+	// dividing the total seconds by 60 will give us

+	// the number of minutes, but we're interested in

+	// minutes past the hour: to get that, we need to

+	// divide by 60 again and keep the remainder

+	$minutes = intval(($sec / 60) % 60);

+

+	// then add to $hms (with a leading 0 if needed)

+	$hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

+

+	// seconds are simple - just divide the total

+	// seconds by 60 and keep the remainder

+	$seconds = intval($sec % 60);

+

+	// add to $hms, again with a leading 0 if needed

+	$hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);

+

+	// done!

+	return $hms;

 }

 

 /**

@@ -61,117 +61,117 @@ 
 {

 

 

-    // NOTE: the id is in the form ga:12345 and not just 12345

-    // if you do e.g. 12345 then no data will be returned

-    // read http://www.electrictoolbox.com/get-id-for-google-analytics-api/ for info about how to get this id from the GA web interface

-    // or load the accounts (see below) and get it from there

-    // if you don't specify an id here, then you'll get the "Badly formatted request to the Google Analytics API..." error message

-    $id = trim(get_option('geodir_ga_id'));

-

-    $at = geodir_ga_get_token();

-

-    $start_date = '';

-    $end_date = '';

-    $dimensions = "&filters=ga:pagePath==" . $page;

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

-        $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

-        $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

-        if(!$ga_start){$ga_start = date('Y')."-01-01";}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

-        $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

-        if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

-        if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

-        $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

-        if(!$ga_start){$ga_start = "14daysAgo";}

-        if(!$ga_end){$ga_end = "yesterday";}

-        $dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

-    }

-

-    $APIURL = "https://www.googleapis.com/analytics/v3/data/ga?";

-    $ids = "ids=".$id;

-    if(!$start_date){$start_date = "&start-date=".$ga_start;}

-    if(!$end_date){$end_date = "&end-date=".$ga_end;}

-    $metrics = "&metrics=ga:pageviews";

-    $filters = "&filters=ga:pagePath==".$page;

-    $access_token = "&access_token=".$at;

-

-    $use_url = $APIURL.$ids.$start_date.$end_date.$dimensions.$metrics.$filters.$access_token;

-

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

-        $metrics = "&metrics=rt:activeUsers";

-        $dimensions = "&filters=ga:pagePath==".$page;

-

-        $use_url = "https://www.googleapis.com/analytics/v3/data/realtime?".$ids.$access_token.$metrics.$dimensions;

-    }

-

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

-

-    // Make countries translatable

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

-        $c_arr = json_decode($response['body']);

-        if(is_array($c_arr->rows)){

-            $new_rows = array();

-            foreach($c_arr->rows as $wow){

-                $new_rows[] = array(__($wow[0],'geodirectory'),$wow[1]);

-            }

-            $c_arr->rows = $new_rows;

-        }

-        $response['body'] = json_encode($c_arr);

-    }

-

-    echo $response['body'];

-    exit;

+	// NOTE: the id is in the form ga:12345 and not just 12345

+	// if you do e.g. 12345 then no data will be returned

+	// read http://www.electrictoolbox.com/get-id-for-google-analytics-api/ for info about how to get this id from the GA web interface

+	// or load the accounts (see below) and get it from there

+	// if you don't specify an id here, then you'll get the "Badly formatted request to the Google Analytics API..." error message

+	$id = trim(get_option('geodir_ga_id'));

+

+	$at = geodir_ga_get_token();

+

+	$start_date = '';

+	$end_date = '';

+	$dimensions = "&filters=ga:pagePath==" . $page;

+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

+		if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

+		if(!$ga_end){$ga_end = date('Y-m-d');}

+		$dimensions = "&dimensions=ga:date,ga:nthDay";

+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+		if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

+		if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

+		$dimensions = "&dimensions=ga:date,ga:nthDay";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+		if(!$ga_start){$ga_start = date('Y')."-01-01";}

+		if(!$ga_end){$ga_end = date('Y-m-d');}

+		$dimensions = "&dimensions=ga:month,ga:nthMonth";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+		if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

+		if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

+		$dimensions = "&dimensions=ga:month,ga:nthMonth";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+		if(!$ga_start){$ga_start = "14daysAgo";}

+		if(!$ga_end){$ga_end = "yesterday";}

+		$dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

+	}

+

+	$APIURL = "https://www.googleapis.com/analytics/v3/data/ga?";

+	$ids = "ids=".$id;

+	if(!$start_date){$start_date = "&start-date=".$ga_start;}

+	if(!$end_date){$end_date = "&end-date=".$ga_end;}

+	$metrics = "&metrics=ga:pageviews";

+	$filters = "&filters=ga:pagePath==".$page;

+	$access_token = "&access_token=".$at;

+

+	$use_url = $APIURL.$ids.$start_date.$end_date.$dimensions.$metrics.$filters.$access_token;

+

+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+		$metrics = "&metrics=rt:activeUsers";

+		$dimensions = "&filters=ga:pagePath==".$page;

+

+		$use_url = "https://www.googleapis.com/analytics/v3/data/realtime?".$ids.$access_token.$metrics.$dimensions;

+	}

+

+	$response =  wp_remote_get($use_url,array('timeout' => 15));

+

+	// Make countries translatable

+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+		$c_arr = json_decode($response['body']);

+		if(is_array($c_arr->rows)){

+			$new_rows = array();

+			foreach($c_arr->rows as $wow){

+				$new_rows[] = array(__($wow[0],'geodirectory'),$wow[1]);

+			}

+			$c_arr->rows = $new_rows;

+		}

+		$response['body'] = json_encode($c_arr);

+	}

+

+	echo $response['body'];

+	exit;

 

 }// end GA function

 

 

 function geodir_ga_get_token(){

-    $at = get_option('gd_ga_access_token');

-    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+	$at = get_option('gd_ga_access_token');

+	$use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

+	$response =  wp_remote_get($use_url,array('timeout' => 15));

 

-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

+	if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

-    return $at;

-    }else{//else get new access token

+	return $at;

+	}else{//else get new access token

 

-        $refresh_at = get_option('gd_ga_refresh_token');

-        if(!$refresh_at){

-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

-        }

+		$refresh_at = get_option('gd_ga_refresh_token');

+		if(!$refresh_at){

+			echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

+		}

 

-        $rat_url = "https://www.googleapis.com/oauth2/v3/token?";

-        $client_id = "client_id=".get_option('geodir_ga_client_id');

-        $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

-        $refresh_token = "&refresh_token=".$refresh_at;

-        $grant_type = "&grant_type=refresh_token";

+		$rat_url = "https://www.googleapis.com/oauth2/v3/token?";

+		$client_id = "client_id=".get_option('geodir_ga_client_id');

+		$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+		$refresh_token = "&refresh_token=".$refresh_at;

+		$grant_type = "&grant_type=refresh_token";

 

-        $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

+		$rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

 

-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

-            $parts = json_decode($rat_response['body']);

+		$rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

+		if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

+			$parts = json_decode($rat_response['body']);

 

 

-            update_option('gd_ga_access_token', $parts->access_token);

-            return $parts->access_token;

+			update_option('gd_ga_access_token', $parts->access_token);

+			return $parts->access_token;

 

-        }else{

-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

-        }

+		}else{

+			echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

+		}

 

 

-    }

+	}

 

 }
\ No newline at end of file

Spacing +36 added lines, -36 removed lines

@@ -25,7 +25,7 @@ 
     $hours = intval(intval($sec) / 3600);

 

     // add to $hms, with a leading 0 if asked for

-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

+    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':';

 

     // dividing the total seconds by 60 will give us

     // the number of minutes, but we're interested in

@@ -34,7 +34,7 @@ 
     $minutes = intval(($sec / 60) % 60);

 

     // then add to $hms (with a leading 0 if needed)

-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

+    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':';

 

     // seconds are simple - just divide the total

     // seconds by 60 and keep the remainder

@@ -72,58 +72,58 @@ 
 

     $start_date = '';

     $end_date = '';

-    $dimensions = "&filters=ga:pagePath==" . $page;

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

+    $dimensions = "&filters=ga:pagePath==".$page;

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {

+        if (!$ga_start) {$ga_start = date('Y-m-d', strtotime("-6 day")); }

+        if (!$ga_end) {$ga_end = date('Y-m-d'); }

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {

+        if (!$ga_start) {$ga_start = date('Y-m-d', strtotime("-13 day")); }

+        if (!$ga_end) {$ga_end = date('Y-m-d', strtotime("-7 day")); }

         $dimensions = "&dimensions=ga:date,ga:nthDay";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

-        if(!$ga_start){$ga_start = date('Y')."-01-01";}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {

+        if (!$ga_start) {$ga_start = date('Y')."-01-01"; }

+        if (!$ga_end) {$ga_end = date('Y-m-d'); }

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

-        if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

-        if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {

+        if (!$ga_start) {$ga_start = date('Y', strtotime("-1 year"))."-01-01"; }

+        if (!$ga_end) {$ga_end = date('Y', strtotime("-1 year"))."-12-31"; }

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

-        if(!$ga_start){$ga_start = "14daysAgo";}

-        if(!$ga_end){$ga_end = "yesterday";}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {

+        if (!$ga_start) {$ga_start = "14daysAgo"; }

+        if (!$ga_end) {$ga_end = "yesterday"; }

         $dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

     }

 

     $APIURL = "https://www.googleapis.com/analytics/v3/data/ga?";

     $ids = "ids=".$id;

-    if(!$start_date){$start_date = "&start-date=".$ga_start;}

-    if(!$end_date){$end_date = "&end-date=".$ga_end;}

+    if (!$start_date) {$start_date = "&start-date=".$ga_start; }

+    if (!$end_date) {$end_date = "&end-date=".$ga_end; }

     $metrics = "&metrics=ga:pageviews";

     $filters = "&filters=ga:pagePath==".$page;

     $access_token = "&access_token=".$at;

 

     $use_url = $APIURL.$ids.$start_date.$end_date.$dimensions.$metrics.$filters.$access_token;

 

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {

         $metrics = "&metrics=rt:activeUsers";

         $dimensions = "&filters=ga:pagePath==".$page;

 

         $use_url = "https://www.googleapis.com/analytics/v3/data/realtime?".$ids.$access_token.$metrics.$dimensions;

     }

 

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+    $response = wp_remote_get($use_url, array('timeout' => 15));

 

     // Make countries translatable

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {

         $c_arr = json_decode($response['body']);

-        if(is_array($c_arr->rows)){

+        if (is_array($c_arr->rows)) {

             $new_rows = array();

-            foreach($c_arr->rows as $wow){

-                $new_rows[] = array(__($wow[0],'geodirectory'),$wow[1]);

+            foreach ($c_arr->rows as $wow) {

+                $new_rows[] = array(__($wow[0], 'geodirectory'), $wow[1]);

             }

             $c_arr->rows = $new_rows;

         }

@@ -136,19 +136,19 @@ 
 }// end GA function

 

 

-function geodir_ga_get_token(){

+function geodir_ga_get_token() {

     $at = get_option('gd_ga_access_token');

     $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+    $response = wp_remote_get($use_url, array('timeout' => 15));

 

-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else {//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

-        if(!$refresh_at){

-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

+        if (!$refresh_at) {

+            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;

         }

 

         $rat_url = "https://www.googleapis.com/oauth2/v3/token?";

@@ -159,16 +159,16 @@ 
 

         $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

 

-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

+        $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));

+        if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {

             $parts = json_decode($rat_response['body']);

 

 

             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

+        } else {

+            echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;

         }

 

 

geodirectory-functions/helper_functions.php

Braces +2 added lines, -2 removed lines

@@ -153,7 +153,7 @@ 
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else{
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
@@ -202,7 +202,7 @@ 
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else{
         $info_url = trailingslashit($home_url);
     }
 

Indentation +125 added lines, -125 removed lines

@@ -14,13 +14,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_add_listing_page_id(){
-    $gd_page_id = get_option('geodir_add_listing_page');
+	$gd_page_id = get_option('geodir_add_listing_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -31,13 +31,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_preview_page_id(){
-    $gd_page_id = get_option('geodir_preview_page');
+	$gd_page_id = get_option('geodir_preview_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -48,13 +48,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_success_page_id(){
-    $gd_page_id = get_option('geodir_success_page');
+	$gd_page_id = get_option('geodir_success_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -65,13 +65,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_location_page_id(){
-    $gd_page_id = get_option('geodir_location_page');
+	$gd_page_id = get_option('geodir_location_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -82,13 +82,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_home_page_id(){
-    $gd_page_id = get_option('geodir_home_page');
+	$gd_page_id = get_option('geodir_home_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -99,13 +99,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_info_page_id(){
-    $gd_page_id = get_option('geodir_info_page');
+	$gd_page_id = get_option('geodir_info_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -116,13 +116,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_page_id(){
-    $gd_page_id = get_option('geodir_login_page');
+	$gd_page_id = get_option('geodir_login_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 
@@ -134,45 +134,45 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_url($args=array()){
-    $gd_page_id = get_option('geodir_login_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-    $home_url = get_home_url();
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $login_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
-    }
-
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
-    }
-
-    /**
-     * Filter the GeoDirectory login page url.
-     *
-     * This filter can be used to change the GeoDirectory page url.
-     *
-     * @since 1.5.3
-     * @package GeoDirectory
-     * @param string $login_url The url of the login page.
-     * @param array $args The array of query args used.
-     * @param int $gd_page_id The page id of the GD login page.
-     */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	$gd_page_id = get_option('geodir_login_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+	$home_url = get_home_url();
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$login_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$login_url = trailingslashit($home_url)."?geodir_signup=true";
+	}
+
+	if($args){
+		$login_url = add_query_arg($args,$login_url );
+	}
+
+	/**
+	 * Filter the GeoDirectory login page url.
+	 *
+	 * This filter can be used to change the GeoDirectory page url.
+	 *
+	 * @since 1.5.3
+	 * @package GeoDirectory
+	 * @param string $login_url The url of the login page.
+	 * @param array $args The array of query args used.
+	 * @param int $gd_page_id The page id of the GD login page.
+	 */
+	return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
 }
 
 /**
@@ -183,34 +183,34 @@ 
  * @return string Info page url.
  */
 function geodir_info_url($args=array()){
-    $gd_page_id = get_option('geodir_info_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-    $home_url = get_home_url();
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $info_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $info_url = trailingslashit($home_url);
-    }
-
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
-    }
-
-    return $info_url;
+	$gd_page_id = get_option('geodir_info_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+	$home_url = get_home_url();
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$info_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$info_url = trailingslashit($home_url);
+	}
+
+	if($args){
+		$info_url = add_query_arg($args,$info_url );
+	}
+
+	return $info_url;
 }
 
 /**
@@ -226,11 +226,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_ucwords($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_TITLE, $charset);
-    } else {
-        return ucwords($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $charset);
+	} else {
+		return ucwords($string);
+	}
 }
 
 /**
@@ -246,11 +246,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtolower($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_LOWER, $charset);
-    } else {
-        return strtolower($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_LOWER, $charset);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
@@ -266,11 +266,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtoupper($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_UPPER, $charset);
-    } else {
-        return strtoupper($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_UPPER, $charset);
+	} else {
+		return strtoupper($string);
+	}
 }
 
 /**
@@ -449,11 +449,11 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
-        return '_gd_die_handler';
-    } else {
-        die();
-    }
+	if ( defined( 'GD_TESTING_MODE' ) ) {
+		return '_gd_die_handler';
+	} else {
+		die();
+	}
 }
 
 /**
@@ -468,7 +468,7 @@ 
  * @param int $status     Optional. Status code.
  */
 function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+	add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
+	add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
+	wp_die( $message, $title, array( 'response' => $status ));
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,11 +133,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
@@ -148,17 +148,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -172,7 +172,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -182,11 +182,11 @@ 
  * @since 1.5.4
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
@@ -197,17 +197,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -225,7 +225,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -245,7 +245,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -265,7 +265,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -296,7 +296,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -306,8 +306,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -449,7 +449,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -467,8 +467,8 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
\ No newline at end of file

geodirectory-functions/map-functions/get_markers.php

Braces +10 added lines, -8 removed lines

@@ -107,11 +107,13 @@ 
         }

     }

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+    if (!empty($field_default_cat)) {
+            $field_default_cat = '';
+    }
 

-    if (!empty($cat_find_array))

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

+    if (!empty($cat_find_array)) {
+            $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
+    }
 

     $main_query_array = $map_cat_ids_array;

   

@@ -143,8 +145,9 @@ 
         $gd_posttype = " AND p.post_type = %s";

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

 

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

+    } else {
+            $table = $plugin_prefix . 'gd_place_detail';
+    }
 

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

 

@@ -309,8 +312,7 @@ 
 

     if (!empty($cat_content_info)) {

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

-    }

-    else {

+    } else {

 		return '[{"totalcount":"0"}]';

 	}

 }
\ No newline at end of file

Indentation +228 added lines, -228 removed lines

@@ -7,59 +7,59 @@ 
  */

  

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'homemap_catlist') {

-    $gd_post_type = sanitize_text_field($_REQUEST['post_type']);

-    $post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

-    die;

+	$gd_post_type = sanitize_text_field($_REQUEST['post_type']);

+	$post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

+	die;

 }

 

 // Send the content-type header with correct encoding

 header("Content-type: text/javascript; charset=utf-8");

 

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'cat') { // Retrives markers data for categories

-    echo get_markers();

-    exit;

+	echo get_markers();

+	exit;

 } else if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'info') { // Retrives marker info window html

-    /**

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $gd_session GeoDirectory Session object.

-     */

-    global $wpdb, $plugin_prefix, $gd_session;

-

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

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

-    } else {

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

-        exit;

-    }

-

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

-        $post = (object)$gd_ses_listing;

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

-    } else {

-        $geodir_post_type = get_post_type($pid);

-

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

-

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

-

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

-

-        $data_arr = array();

-

-        if ($postinfo) {

-            $srcharr = array("'", "/", "-", '"', '\\');

-            $replarr = array("′", "⁄", "–", "“", '');

-

-            foreach ($postinfo as $postinfo_obj) {

-                echo geodir_get_infowindow_html($postinfo_obj);

-            }

-        }

-    }

-    exit;

+	/**

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $gd_session GeoDirectory Session object.

+	 */

+	global $wpdb, $plugin_prefix, $gd_session;

+

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

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

+	} else {

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

+		exit;

+	}

+

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

+		$post = (object)$gd_ses_listing;

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

+	} else {

+		$geodir_post_type = get_post_type($pid);

+

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

+

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

+

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

+

+		$data_arr = array();

+

+		if ($postinfo) {

+			$srcharr = array("'", "/", "-", '"', '\\');

+			$replarr = array("′", "⁄", "–", "“", '');

+

+			foreach ($postinfo as $postinfo_obj) {

+				echo geodir_get_infowindow_html($postinfo_obj);

+			}

+		}

+	}

+	exit;

 }

 

 /**

@@ -77,80 +77,80 @@ 
  * @return string

  */

 function get_markers() {

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

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

 

-    $search = '';

-    $main_query_array;

+	$search = '';

+	$main_query_array;

 

-    $srcharr = array("'", "/", "-", '"', '\\');

-    $replarr = array("′", "⁄", "–", "“", '');

+	$srcharr = array("'", "/", "-", '"', '\\');

+	$replarr = array("′", "⁄", "–", "“", '');

 

-    $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

+	$post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

-    $map_cat_ids_array = array('0');

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

+	$map_cat_ids_array = array('0');

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

 

 

-    $field_default_cat = '';

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

-        $map_cat_arr = trim($_REQUEST['cat_id'], ',');

+	$field_default_cat = '';

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

+		$map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

-        if (!empty($map_cat_arr)) {

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

+		if (!empty($map_cat_arr)) {

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

 

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

-            $cat_find_array = array();

-            foreach ($map_cat_ids_array as $cat_id) {

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

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

-                $main_query_array[] = $cat_id;

-            }

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

+			$cat_find_array = array();

+			foreach ($map_cat_ids_array as $cat_id) {

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

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

+				$main_query_array[] = $cat_id;

+			}

 

-        }

-    }

+		}

+	}

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+	if (!empty($field_default_cat))

+		$field_default_cat = '';

 

-    if (!empty($cat_find_array))

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

+	if (!empty($cat_find_array))

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

 

-    $main_query_array = $map_cat_ids_array;

+	$main_query_array = $map_cat_ids_array;

   

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

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

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

-    }

-

-    /**

-     * Filter the marker query search SQL, values are replaces with %s or %d.

-     *

-     * @since 1.5.3

-     *

-     * @param string $search The SQL query for search/where.

-     */

-    $search = apply_filters('geodir_marker_search', $search);

-    /**

-     * Filter the marker query search SQL values %s and %d, this is an array of values.

-     *

-     * @since 1.5.3

-     *

-     * @param array $main_query_array The SQL query values for search/where.

-     */

-    $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

-

-    $gd_posttype = '';

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

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

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

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

-

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

-

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

-

-    /**

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

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

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

+	}

+

+	/**

+	 * Filter the marker query search SQL, values are replaces with %s or %d.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param string $search The SQL query for search/where.

+	 */

+	$search = apply_filters('geodir_marker_search', $search);

+	/**

+	 * Filter the marker query search SQL values %s and %d, this is an array of values.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param array $main_query_array The SQL query values for search/where.

+	 */

+	$main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

+

+	$gd_posttype = '';

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

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

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

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

+

+	} else

+		$table = $plugin_prefix . 'gd_place_detail';

+

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

+

+	/**

 	 * Filter the SQL JOIN clause for the markers data

 	 *

 	 * @since 1.0.0

@@ -167,16 +167,16 @@ 
 	 * @param string $search Row of searched fields to use in WHERE clause.

 	 */

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

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

-    $cat_type = $post_type . 'category';

-    if ($post_type == 'gd_event') {

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

-    } else {

-        $event_select = "";

-    }

-

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

-    /**

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

+	$cat_type = $post_type . 'category';

+	if ($post_type == 'gd_event') {

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

+	} else {

+		$event_select = "";

+	}

+

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

+	/**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

 	 * @since 1.0.0

@@ -195,7 +195,7 @@ 
 	 */

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

 

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

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

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -207,125 +207,125 @@ 
 	 */

 	$catsql = apply_filters('geodir_home_map_listing_query', $catsql, $search);

 

-    $catinfo = $wpdb->get_results($catsql);

+	$catinfo = $wpdb->get_results($catsql);

 	

-    $cat_content_info = array();

-    $content_data = array();

-    $post_ids = array();

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.5.3

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    do_action('geodir_before_marker_post_process_action', $catinfo);

-

-    // Sort any posts into a ajax array

-    if (!empty($catinfo)) {

-        $geodir_cat_icons = geodir_get_term_icon();

-        global $geodir_date_format;

-

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

+	$cat_content_info = array();

+	$content_data = array();

+	$post_ids = array();

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.5.3

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	$catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	do_action('geodir_before_marker_post_process_action', $catinfo);

+

+	// Sort any posts into a ajax array

+	if (!empty($catinfo)) {

+		$geodir_cat_icons = geodir_get_term_icon();

+		global $geodir_date_format;

+

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

         

-        foreach ($catinfo as $catinfo_obj) {

-            $post_title = $catinfo_obj->post_title;

+		foreach ($catinfo as $catinfo_obj) {

+			$post_title = $catinfo_obj->post_title;

             

-            if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates)) {

-                $event_dates = '';

-                $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array();

+			if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates)) {

+				$event_dates = '';

+				$recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array();

                 

-                $post_info = geodir_get_post_info($catinfo_obj->post_id);

-                if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

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

+				$post_info = geodir_get_post_info($catinfo_obj->post_id);

+				if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

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

                     

-                    if (!empty($recurring_dates)) {					

-                        $e = 0;

-                        foreach ($recurring_dates as $date) {

-                            if (strtotime($date) >= $today) {

-                                $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($date));

+					if (!empty($recurring_dates)) {					

+						$e = 0;

+						foreach ($recurring_dates as $date) {

+							if (strtotime($date) >= $today) {

+								$event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($date));

                                 

-                                $e++;

-                                if ($e == 3) { // only show 3 event dates

-                                    break;

-                                }

-                            }

-                        }

-                    }

-                } else {

-                    $start_date = !empty($recurring_data['event_start']) && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? $recurring_data['event_start'] : '';

-                    $end_date = !empty($recurring_data['event_end']) && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? $recurring_data['event_end'] : $start_date;

+								$e++;

+								if ($e == 3) { // only show 3 event dates

+									break;

+								}

+							}

+						}

+					}

+				} else {

+					$start_date = !empty($recurring_data['event_start']) && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? $recurring_data['event_start'] : '';

+					$end_date = !empty($recurring_data['event_end']) && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? $recurring_data['event_end'] : $start_date;

                 

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

-                        $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($start_date)) .' -> ' . date_i18n($geodir_date_format, strtotime($end_date));

-                    }

-                }

-

-                if (empty($event_dates)) {

-                    continue;

-                }

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

+						$event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($start_date)) .' -> ' . date_i18n($geodir_date_format, strtotime($end_date));

+					}

+				}

+

+				if (empty($event_dates)) {

+					continue;

+				}

                 

-                $post_title .= $event_dates;

-            }

+				$post_title .= $event_dates;

+			}

 

-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$catinfo_obj->default_category]) ? $geodir_cat_icons[$catinfo_obj->default_category] : '';

-            $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

-            $title = str_replace($srcharr, $replarr, $post_title);

+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$catinfo_obj->default_category]) ? $geodir_cat_icons[$catinfo_obj->default_category] : '';

+			$mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

+			$title = str_replace($srcharr, $replarr, $post_title);

             

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

-            }

-

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

-            $post_ids[] = $catinfo_obj->post_id;

-        }

-    }

-

-    /**

-     * Called after marker data is processed into JSON.

-     *

-     * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param array $content_data The array containing all markers in JSON format.

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_before_marker_post_process'

-     */

-    do_action('geodir_after_marker_post_process', $content_data, $catinfo);

-

-    if (!empty($content_data)) {

-        $cat_content_info[] = implode(',', $content_data);

-    }

-

-    $totalcount = count(array_unique($post_ids));

-

-    if (!empty($cat_content_info)) {

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

-    }

-    else {

-        return '[{"totalcount":"0"}]';

-    }

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

+			}

+

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

+			$post_ids[] = $catinfo_obj->post_id;

+		}

+	}

+

+	/**

+	 * Called after marker data is processed into JSON.

+	 *

+	 * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param array $content_data The array containing all markers in JSON format.

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_before_marker_post_process'

+	 */

+	do_action('geodir_after_marker_post_process', $content_data, $catinfo);

+

+	if (!empty($content_data)) {

+		$cat_content_info[] = implode(',', $content_data);

+	}

+

+	$totalcount = count(array_unique($post_ids));

+

+	if (!empty($cat_content_info)) {

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

+	}

+	else {

+		return '[{"totalcount":"0"}]';

+	}

 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
     $gd_post_type = sanitize_text_field($_REQUEST['post_type']);

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

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

     die;

 }

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

 

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

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

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

     } else {

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

         exit;

     }

 

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

-        $post = (object)$gd_ses_listing;

+        $post = (object) $gd_ses_listing;

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

     } else {

         $geodir_post_type = get_post_type($pid);

 

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

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

 

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

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

 

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

 

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

 

     $map_cat_ids_array = array('0');

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

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

 

 

     $field_default_cat = '';

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

 

         if (!empty($map_cat_arr)) {

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

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

 

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

             $cat_find_array = array();

             foreach ($map_cat_ids_array as $cat_id) {

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

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

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

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

                 $main_query_array[] = $cat_id;

             }

 

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

 

     if (!empty($cat_find_array))

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

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

 

     $main_query_array = $map_cat_ids_array;

   

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

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

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

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

     }

 

     /**

@@ -141,14 +141,14 @@ 
 

     $gd_posttype = '';

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

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

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

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

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

 

     } else

-        $table = $plugin_prefix . 'gd_place_detail';

+        $table = $plugin_prefix.'gd_place_detail';

 

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

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

 

     /**

 	 * Filter the SQL JOIN clause for the markers data

@@ -168,14 +168,14 @@ 
 	 */

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

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

-    $cat_type = $post_type . 'category';

+    $cat_type = $post_type.'category';

     if ($post_type == 'gd_event') {

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

     } else {

         $event_select = "";

     }

 

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

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

     /**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

@@ -195,7 +195,7 @@ 
 	 */

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

 

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

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

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -257,7 +257,7 @@ 
                         $e = 0;

                         foreach ($recurring_dates as $date) {

                             if (strtotime($date) >= $today) {

-                                $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($date));

+                                $event_dates .= ' :: '.date_i18n($geodir_date_format, strtotime($date));

                                 

                                 $e++;

                                 if ($e == 3) { // only show 3 event dates

@@ -271,7 +271,7 @@ 
                     $end_date = !empty($recurring_data['event_end']) && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? $recurring_data['event_end'] : $start_date;

                 

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

-                        $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($start_date)) .' -> ' . date_i18n($geodir_date_format, strtotime($end_date));

+                        $event_dates .= ' :: '.date_i18n($geodir_date_format, strtotime($start_date)).' -> '.date_i18n($geodir_date_format, strtotime($end_date));

                     }

                 }

 

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

             }

 

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

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

             $post_ids[] = $catinfo_obj->post_id;

         }

     }

@@ -323,7 +323,7 @@ 
     $totalcount = count(array_unique($post_ids));

 

     if (!empty($cat_content_info)) {

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

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

     }

     else {

         return '[{"totalcount":"0"}]';

geodirectory-functions/map-functions/map_on_add_listing_page.php

Braces +7 added lines, -5 removed lines

@@ -45,9 +45,10 @@ 
 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

     $mapzoom = 4;

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

-        $mapzoom = 10;

-}

+    if (isset($_REQUEST['add_hood'])) {
+            $mapzoom = 10;
+    }
+    }

 

 /**

  * Filter the auto change address fields values

@@ -641,8 +642,9 @@ 
 </script>

 <?php

 $set_button_class = 'geodir_button';

-if (is_admin())

-    $set_button_class = 'button-primary';

+if (is_admin()) {
+    $set_button_class = 'button-primary';
+}
 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>"

        value="<?php _e($map_title, 'geodirectory'); ?>" style="float:none;"/>

Indentation +55 added lines, -55 removed lines

@@ -34,19 +34,19 @@ 
 $defaultcity = isset($default_location->city) ? $default_location->city : '';

 $lat_lng_blank = false;

 if ($lat == '' && $lng == '') {

-    $lat_lng_blank = true;

-    $city = $defaultcity;

-    $region = isset($default_location->region) ? $default_location->region : '';

-    $country = isset($default_location->country) ? $default_location->country : '';

-    $lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$lat_lng_blank = true;

+	$city = $defaultcity;

+	$region = isset($default_location->region) ? $default_location->region : '';

+	$country = isset($default_location->country) ? $default_location->country : '';

+	$lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 }

 $default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

-    $mapzoom = 4;

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

-        $mapzoom = 10;

+	$mapzoom = 4;

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

+		$mapzoom = 10;

 }

 

 /**

@@ -67,7 +67,7 @@ 
 	 * Fires at the start of the add javascript on the add lsitings map.

 	 *

 	 * @since 1.0.0

-     * @param string $prefix The prefix for all elements.

+	 * @param string $prefix The prefix for all elements.

 	 */

 	do_action('geodir_add_listing_js_start', $prefix);

 	?>

@@ -314,13 +314,13 @@ 
                 getZip = postal_code.long_name;

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

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

         }

         <?php

-        /**

-         * Fires when marker address updated on map.

-         *

-         * @since 1.0.0

-         * @param string $prefix Identifier used as a prefix for field name

-         */

-        do_action('geodir_update_marker_address', $prefix);

-        echo $updateMarkerAddress = ob_get_clean();

-        ?>

+		/**

+		 * Fires when marker address updated on map.

+		 *

+		 * @since 1.0.0

+		 * @param string $prefix Identifier used as a prefix for field name

+		 */

+		do_action('geodir_update_marker_address', $prefix);

+		echo $updateMarkerAddress = ob_get_clean();

+		?>

     }

     function geodir_codeAddress(set_on_map) {

         var address = jQuery('#<?php echo $prefix.'address';?>').val();

@@ -435,9 +435,9 @@ 
         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

-        $defaultregion = isset($default_location->region) ? $default_location->region : '';

-        $defaultcountry = isset($default_location->country) ? $default_location->country : '';

-        ?>

+		$defaultregion = isset($default_location->region) ? $default_location->region : '';

+		$defaultcountry = isset($default_location->country) ? $default_location->country : '';

+		?>

         if (set_on_map && is_restrict) {

             if (zip != '' && address != '') {

                 address = address + ',' + zip;

@@ -446,12 +446,12 @@ 
             if (typeof address === 'undefined')

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+			if(is_admin() && isset($_REQUEST['tab'])){?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

             <?php

-               }?>

+			   }?>

 

             if (ISO2 == 'GB') {

                 address = address + ',' + city + ',' + country + ',' + zip; // UK is funny with regions

@@ -460,15 +460,15 @@ 
             }

         }

         <?php $codeAddress = ob_get_clean();

-        /**

-         * Filter the address variable

-         *

-         * @since 1.0.0

-         *

-         * @param string $codeAddress Row of address to use in google map.

-         */

-        echo apply_filters('geodir_codeaddress', $codeAddress);

-        ?>

+		/**

+		 * Filter the address variable

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param string $codeAddress Row of address to use in google map.

+		 */

+		echo apply_filters('geodir_codeaddress', $codeAddress);

+		?>

         if (!window.gdMaps) { // No Google Map Loaded

             return;

         }

@@ -493,13 +493,13 @@ 
                         updateMarkerPosition(baseMarker.getPosition());

                         //if(set_on_map && is_restrict) {

                         <?php 

-                        /**

-                         * Fires before set geocode position.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_add_listing_codeaddress_before_geocode');

-                        ?>

+						/**

+						 * Fires before set geocode position.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_add_listing_codeaddress_before_geocode');

+						?>

                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

@@ -545,13 +545,13 @@ 
                 updateMarkerPositionOSM(baseMarker.getLatLng());

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

@@ -699,7 +699,7 @@ 
 <?php

 $set_button_class = 'geodir_button';

 if (is_admin())

-    $set_button_class = 'button-primary';

+	$set_button_class = 'button-primary';

 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

Spacing +75 added lines, -75 removed lines

@@ -81,16 +81,16 @@ 
     window.gdMaps = window.gdMaps || gdMaps;

     

     user_address = false;

-    jQuery('#<?php echo $prefix.'address';?>').keypress(function () {

+    jQuery('#<?php echo $prefix.'address'; ?>').keypress(function () {

         user_address = true;

     });

 

     baseMarker = '';

     geocoder = '';

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat :  '39.952484'; ?>;

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng :  '-75.163786'; ?>;

-    <?php if($lat_lng_blank){$lat='';$lng='';}?>

-    var <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12;?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>;

+    <?php if ($lat_lng_blank) {$lat = ''; $lng = ''; }?>

+    var <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12; ?>;

     var minZoomLevel = <?php echo ($is_map_restrict) ? 5 : 0; ?>;

     var oldstr_address;

     var oldstr_zip;

@@ -322,9 +322,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 jQuery.goMap.map.setCenter(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setPosition(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPosition(baseMarker.getPosition());

@@ -333,11 +333,11 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     function centerMap(latlng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         if (window.gdMaps == 'google') {

             jQuery.goMap.map.panTo(baseMarker.getPosition());

         } else if (window.gdMaps == 'osm') {

@@ -346,7 +346,7 @@ 
         }

     }

     function centerMarker() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         var center = jQuery.goMap.map.getCenter();

         if (window.gdMaps == 'google') {

             baseMarker.setPosition(center);

@@ -355,47 +355,47 @@ 
         }

     }

     function updateMapZoom(zoom) {

-        jQuery('#<?php echo $prefix.'mapzoom';?>').val(zoom);

+        jQuery('#<?php echo $prefix.'mapzoom'; ?>').val(zoom);

     }

     function updateMarkerPosition(markerlatLng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat());

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng());

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat());

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng());

     }

     function updateMarkerPositionOSM(markerlatLng) {

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat);

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng);

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat);

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng);

     }

     function updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry) {

-        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields);?>';

-        <?php ob_start();?>

-        var old_country = jQuery("#<?php echo $prefix.'country';?>").val();

-        var old_region = jQuery("#<?php echo $prefix.'region';?>").val();

+        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields); ?>';

+        <?php ob_start(); ?>

+        var old_country = jQuery("#<?php echo $prefix.'country'; ?>").val();

+        var old_region = jQuery("#<?php echo $prefix.'region'; ?>").val();

         

-        if (user_address == false || jQuery('#<?php echo $prefix.'address';?>').val() == '') {

-            jQuery("#<?php echo $prefix.'address';?>").val(getAddress);

+        if (user_address == false || jQuery('#<?php echo $prefix.'address'; ?>').val() == '') {

+            jQuery("#<?php echo $prefix.'address'; ?>").val(getAddress);

         }

         if (getAddress) {

             oldstr_address = getAddress;

         }

         

-        jQuery("#<?php echo $prefix.'zip';?>").val(getZip);

+        jQuery("#<?php echo $prefix.'zip'; ?>").val(getZip);

         if (getZip) {

             oldstr_zip = getZip;

         }

         if (set_map_val_in_fields) {

             if (getCountry) {

-                jQuery('#<?php echo $prefix.'country';?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

-                jQuery("#<?php echo $prefix.'country';?>").trigger("chosen:updated");

+                jQuery('#<?php echo $prefix.'country'; ?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

+                jQuery("#<?php echo $prefix.'country'; ?>").trigger("chosen:updated");

             }

             if (getState) {

-                if (jQuery('input[id="<?php echo $prefix.'region';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'region';?>").val(getState);

+                if (jQuery('input[id="<?php echo $prefix.'region'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'region'; ?>").val(getState);

                 }

             }

             if (getCity) {

-                if (jQuery('input[id="<?php echo $prefix.'city';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'city';?>").val(getCity);

+                if (jQuery('input[id="<?php echo $prefix.'city'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'city'; ?>").val(getCity);

                 }

             }

         }

@@ -411,12 +411,12 @@ 
         ?>

     }

     function geodir_codeAddress(set_on_map) {

-        var address = jQuery('#<?php echo $prefix.'address';?>').val();

-        var zip = jQuery('#<?php echo $prefix.'zip';?>').val();

-        var city = jQuery('#<?php echo $prefix.'city';?>').val();

-        var region = jQuery('#<?php echo $prefix.'region';?>').val();

-        var country = jQuery('#<?php echo $prefix.'country';?>').val();

-        var country_selected = jQuery('#<?php echo $prefix.'country';?>').find('option:selected');

+        var address = jQuery('#<?php echo $prefix.'address'; ?>').val();

+        var zip = jQuery('#<?php echo $prefix.'zip'; ?>').val();

+        var city = jQuery('#<?php echo $prefix.'city'; ?>').val();

+        var region = jQuery('#<?php echo $prefix.'region'; ?>').val();

+        var country = jQuery('#<?php echo $prefix.'country'; ?>').val();

+        var country_selected = jQuery('#<?php echo $prefix.'country'; ?>').find('option:selected');

         var ISO2 = country_selected.data('country_code');

         if (ISO2 == '--') {

             ISO2 = '';

@@ -425,13 +425,13 @@ 
             zip = '';

         }

         if (typeof city == "undefined") {

-            city = '<?php echo addslashes_gpc($city);?>';

+            city = '<?php echo addslashes_gpc($city); ?>';

         }

         if (typeof region == "undefined") {

-            region = '<?php echo addslashes_gpc($region);?>';

+            region = '<?php echo addslashes_gpc($region); ?>';

         }

         if (typeof country == "undefined") {

-            country = '<?php echo addslashes_gpc($country);?>';

+            country = '<?php echo addslashes_gpc($country); ?>';

         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

@@ -446,7 +446,7 @@ 
             if (typeof address === 'undefined')

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+            if (is_admin() && isset($_REQUEST['tab'])) {?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

@@ -486,7 +486,7 @@ 
             geocoder.geocode({'address': address, 'country': ISO2},

                 function (results, status) {

                     console.log(status);

-                    jQuery("#<?php echo $prefix.'map';?>").goMap();

+                    jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         baseMarker.setPosition(results[0].geometry.location);

                         jQuery.goMap.map.setCenter(results[0].geometry.location);

@@ -503,21 +503,21 @@ 
                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

-                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:','geodirectory'));?> ' + status);

+                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:', 'geodirectory')); ?> ' + status);

                     }

                 });

         }

     }

     function gdMaxMap() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

 

-        jQuery('#<?php echo $prefix.'map';?>').toggleClass('map-fullscreen');

+        jQuery('#<?php echo $prefix.'map'; ?>').toggleClass('map-fullscreen');

         jQuery('.map_category').toggleClass('map_category_fullscreen');

-        jQuery('#<?php echo $prefix;?>trigger').toggleClass('map_category_fullscreen');

+        jQuery('#<?php echo $prefix; ?>trigger').toggleClass('map_category_fullscreen');

         jQuery('body').toggleClass('body_fullscreen');

-        jQuery('#<?php echo $prefix;?>loading_div').toggleClass('loading_div_fullscreen');

-        jQuery('#<?php echo $prefix;?>advmap_nofound').toggleClass('nofound_fullscreen');

-        jQuery('#<?php echo $prefix;?>triggermap').toggleClass('triggermap_fullscreen');

+        jQuery('#<?php echo $prefix; ?>loading_div').toggleClass('loading_div_fullscreen');

+        jQuery('#<?php echo $prefix; ?>advmap_nofound').toggleClass('nofound_fullscreen');

+        jQuery('#<?php echo $prefix; ?>triggermap').toggleClass('triggermap_fullscreen');

         jQuery('.TopLeft').toggleClass('TopLeft_fullscreen');

         window.setTimeout(function () {

             if (window.gdMaps == 'google') {

@@ -553,9 +553,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 centerMap(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setLatLng(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPositionOSM(baseMarker.getLatLng());

@@ -564,39 +564,39 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     

     jQuery(function ($) {

-        $("#<?php echo $prefix.'map';?>").goMap({

-            latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-            longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

-            zoom: <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT,

+        $("#<?php echo $prefix.'map'; ?>").goMap({

+            latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+            longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

+            zoom: <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT,

             maptype: 'ROADMAP', // Map type - HYBRID, ROADMAP, SATELLITE, TERRAIN

             streetViewControl: true,

-            <?php if(get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,';}?>

+            <?php if (get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,'; }?>

         });

 

         if (window.gdMaps) {

             geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : [];

 

             baseMarker = $.goMap.createMarker({

-                latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-                longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

+                latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+                longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

                 id: 'baseMarker',

-                icon: '<?php echo $marker_icon;?>',

+                icon: '<?php echo $marker_icon; ?>',

                 draggable: true,

                 addToMap: true, // For OSM

-                w: parseFloat('<?php echo $icon_size['w'];?>'),

-                h: parseFloat('<?php echo $icon_size['h'];?>'),

+                w: parseFloat('<?php echo $icon_size['w']; ?>'),

+                h: parseFloat('<?php echo $icon_size['h']; ?>'),

             });

         } else {

-            jQuery('#<?php echo $prefix.'advmap_nofound';?>').hide();

-            jQuery('#<?php echo $prefix.'advmap_notloaded';?>').show();

+            jQuery('#<?php echo $prefix.'advmap_nofound'; ?>').hide();

+            jQuery('#<?php echo $prefix.'advmap_notloaded'; ?>').show();

         }

         

-        $("#<?php echo $prefix;?>set_address_button").click(function () {

+        $("#<?php echo $prefix; ?>set_address_button").click(function () {

             var set_on_map = true;

             geodir_codeAddress(set_on_map);

         });

@@ -630,14 +630,14 @@ 
                 updateMapZoom($.goMap.map.zoom);

             });

 

-            var maxMap = document.getElementById('<?php echo $prefix;?>triggermap');

+            var maxMap = document.getElementById('<?php echo $prefix; ?>triggermap');

             google.maps.event.addDomListener(maxMap, 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country); ?>';

             geocoder.geocode({'address': CITY_ADDRESS},

                 function (results, status) {

-                    $("#<?php echo $prefix.'map';?>").goMap();

+                    $("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         // Bounds for North America

                         var bound_lat_lng = String(results[0].geometry.bounds);

@@ -648,13 +648,13 @@ 
                             new google.maps.LatLng(bound_lat_lng[2], bound_lat_lng[3])

                         );

                     } else {

-                        alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                        alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                     }

                 });

             <?php } ?>

             // Limit the zoom level

             google.maps.event.addListener($.goMap.map, 'zoom_changed', function () {

-                $("#<?php echo $prefix.'map';?>").goMap();

+                $("#<?php echo $prefix.'map'; ?>").goMap();

                 if ($.goMap.map.getZoom() < minZoomLevel) $.goMap.map.setZoom(minZoomLevel);

             });

         } else if (window.gdMaps == 'osm') {

@@ -680,10 +680,10 @@ 
                 updateMapZoom($.goMap.map.getZoom());

             });

 

-            L.DomEvent.addListener($('<?php echo $prefix;?>triggermap'), 'click', gdMaxMap);

+            L.DomEvent.addListener($('<?php echo $prefix; ?>triggermap'), 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country); ?>';

             geocodePositionOSM('', CITY_ADDRESS);

             <?php } ?>

             // Limit the zoom level

@@ -706,14 +706,14 @@ 
 <div class="top_banner_section_inn geodir_map_container clearfix" style="margin-top:10px;">

     <div class="TopLeft"><span id="<?php echo $prefix; ?>triggermap" style="margin-top:-11px;margin-left:-12px;"></span></div>

     <div class="TopRight"></div>

-    <div id="<?php echo $prefix . 'map'; ?>" class="geodir_map" style="height:300px">

+    <div id="<?php echo $prefix.'map'; ?>" class="geodir_map" style="height:300px">

         <!-- new map start -->

         <div class="iprelative">

-            <div id="<?php echo $prefix . 'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

+            <div id="<?php echo $prefix.'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

             <div id="<?php echo $prefix; ?>loading_div" style="height:300px"></div>

             <div id="<?php echo $prefix; ?>advmap_counter"></div>

             <div id="<?php echo $prefix; ?>advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-            <div id="<?php echo $prefix;?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

+            <div id="<?php echo $prefix; ?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

         </div>

         <!-- new map end -->

     </div>

geodirectory-functions/map-functions/map_template_tags.php

Braces +8 added lines, -6 removed lines

@@ -223,10 +223,11 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

+                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters']) {
+                                    $show_entire_cat_panel = "none";
+                } else {
+                                    $show_entire_cat_panel = "''";
+                }
                 ?>

 

                 <?php if ($geodir_map_options['enable_map_direction']) { ?>

@@ -288,8 +289,9 @@ 
 				}

 				

 				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

+				if (empty($geodir_default_map_search_pt)) {
+									$geodir_default_map_search_pt = 'gd_place';
+				}
 

 				/**

 				 * Filter the post type to retrive data for map

Indentation +129 added lines, -129 removed lines

@@ -67,77 +67,77 @@ 
  */

 function geodir_draw_map($map_args = array())

 {

-    global $map_canvas_arr;

-    $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

-    $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

-

-    $default_location = geodir_get_default_location();

-

-    $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-    $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $map_default_zoom = 12;

-    // map options default values

-    $width = 950;

-    $height = 450;

-    $child_collapse = '0';

-    $sticky = '';

-    $enable_cat_filters = false;

-    $enable_text_search = false;

-    $enable_post_type_filters = false;

-    $enable_location_filters = false;

-    $enable_jason_on_load = false;

-    $enable_map_direction = false;

-    $enable_marker_cluster = false;

-    $enable_map_resize_button = false;

-    $maptype = 'ROADMAP';

-

-    $geodir_map_options = array(

-        'width' => $width,

-        'height' => $height,

-        'child_collapse' => $child_collapse,

-        'sticky' => $sticky,

-        'enable_map_resize_button' => $enable_map_resize_button,

-        'enable_cat_filters' => $enable_cat_filters,

-        'enable_text_search' => $enable_text_search,

-        'enable_post_type_filters' => $enable_post_type_filters,

-        'enable_location_filters' => $enable_location_filters,

-        'enable_jason_on_load' => $enable_jason_on_load,

-        'enable_map_direction' => $enable_map_direction,

-        'enable_marker_cluster' => $enable_marker_cluster,

-        'ajax_url' => geodir_get_ajax_url(),

-        'map_canvas_name' => $map_canvas_name,

-        'inputText' => __('Title or Keyword', 'geodirectory'),

-        'latitude' => $map_default_lat,

-        'longitude' => $map_default_lng,

-        'zoom' => $map_default_zoom,

-        'scrollwheel' => true,

-        'streetViewControl' => true,

-        'maptype' => $maptype,

-        'showPreview' => '0',

-        'maxZoom' => 21,

-        'autozoom' => true,

-        'bubble_size' => 'small',

-        'token' => '68f48005e256696074e1da9bf9f67f06',

-        'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

-    );

-

-    if (!empty($map_args)) {

-        foreach ($map_args as $map_option_key => $map_option_value) {

-            $geodir_map_options[$map_option_key] = $map_option_value;

-        }

-    }

-

-    if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

-    } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

-    }

-

-    if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

-    } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

-    }

-

-    /**

+	global $map_canvas_arr;

+	$map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

+	$map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

+

+	$default_location = geodir_get_default_location();

+

+	$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$map_default_zoom = 12;

+	// map options default values

+	$width = 950;

+	$height = 450;

+	$child_collapse = '0';

+	$sticky = '';

+	$enable_cat_filters = false;

+	$enable_text_search = false;

+	$enable_post_type_filters = false;

+	$enable_location_filters = false;

+	$enable_jason_on_load = false;

+	$enable_map_direction = false;

+	$enable_marker_cluster = false;

+	$enable_map_resize_button = false;

+	$maptype = 'ROADMAP';

+

+	$geodir_map_options = array(

+		'width' => $width,

+		'height' => $height,

+		'child_collapse' => $child_collapse,

+		'sticky' => $sticky,

+		'enable_map_resize_button' => $enable_map_resize_button,

+		'enable_cat_filters' => $enable_cat_filters,

+		'enable_text_search' => $enable_text_search,

+		'enable_post_type_filters' => $enable_post_type_filters,

+		'enable_location_filters' => $enable_location_filters,

+		'enable_jason_on_load' => $enable_jason_on_load,

+		'enable_map_direction' => $enable_map_direction,

+		'enable_marker_cluster' => $enable_marker_cluster,

+		'ajax_url' => geodir_get_ajax_url(),

+		'map_canvas_name' => $map_canvas_name,

+		'inputText' => __('Title or Keyword', 'geodirectory'),

+		'latitude' => $map_default_lat,

+		'longitude' => $map_default_lng,

+		'zoom' => $map_default_zoom,

+		'scrollwheel' => true,

+		'streetViewControl' => true,

+		'maptype' => $maptype,

+		'showPreview' => '0',

+		'maxZoom' => 21,

+		'autozoom' => true,

+		'bubble_size' => 'small',

+		'token' => '68f48005e256696074e1da9bf9f67f06',

+		'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

+	);

+

+	if (!empty($map_args)) {

+		foreach ($map_args as $map_option_key => $map_option_value) {

+			$geodir_map_options[$map_option_key] = $map_option_value;

+		}

+	}

+

+	if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

+	} else {

+		$geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+	}

+

+	if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

+	} else {

+		$geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+	}

+

+	/**

 	 * Filter the options to use in google map.

 	 *

 	 * @since 1.0.0

@@ -146,9 +146,9 @@ 
 	 */

 	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

-    $map_canvas_arr[$map_canvas_name] = array();

+	$map_canvas_arr[$map_canvas_name] = array();

 

-    /**

+	/**

 	 * Filter the post types to display data on map.

 	 *

 	 * @since 1.0.0

@@ -166,20 +166,20 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

-        // Set default map options

+	if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+		// Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+		wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

 

-        wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

+		wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

-        if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

-            $map_width = '100%';

-        } else {

-            $map_width = $geodir_map_options['width'];

-        }

+		if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

+			$map_width = '100%';

+		} else {

+			$map_width = $geodir_map_options['width'];

+		}

 

-        /**

+		/**

 		 * Filter the width of map.

 		 *

 		 * @since 1.0.0

@@ -187,7 +187,7 @@ 
 		 * @param int $map_width Width of map box, eg: gd_place.

 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

-        ?>

+		?>

         <div id="catcher_<?php echo $map_canvas_name;?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

@@ -219,15 +219,15 @@ 
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

                 <?php } else {

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

-                ?>

+				if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

+					$show_entire_cat_panel = "none";

+				else

+					$show_entire_cat_panel = "''";

+				?>

 

                 <?php if ($geodir_map_options['enable_map_direction']) { ?>

 

@@ -278,8 +278,8 @@ 
                         <select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">

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

                             <option <?php if (get_option('geodir_search_dist_1') == 'km') {

-                                echo 'selected="selected"';

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

+								echo 'selected="selected"';

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

                         </select>

                     </div>

 

@@ -302,13 +302,13 @@ 
 				?>

                 <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

                     <?php

-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

-                    $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+					$geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

 					$map_cat_class = '';

 					if ($geodir_map_options['enable_post_type_filters']) {

 						$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

 					}

-                    ?>

+					?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

                         <div class="trigger triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

@@ -326,7 +326,7 @@ 
                                 <?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>

                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

-                                    ?>

+									?>

                                     <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

@@ -349,17 +349,17 @@ 
                 <!-- map-category-listings-->

 

                 <?php

-                if ($geodir_map_options['enable_location_filters']) {

+				if ($geodir_map_options['enable_location_filters']) {

 					$country = get_query_var('gd_country');

 					$region = get_query_var('gd_region');

 					$city = get_query_var('gd_city');

                     

-                    //fix for location/me page

-                    $country = $country != 'me' ? $country : '';

+					//fix for location/me page

+					$country = $country != 'me' ? $country : '';

 					$region = $region != 'me' ? $region : '';

 					$city = $country != 'me' ? $city : '';

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

-                    ?>

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

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

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

@@ -370,7 +370,7 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

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

                 <?php } else { //end of location filter

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

                 <?php }?>

 

@@ -381,9 +381,9 @@ 
 

 

                 <?php if ($geodir_map_options['enable_post_type_filters']) {

-                    $post_types = geodir_get_posttypes('object');

-                    if (count((array)($post_types)) > 1) {

-                        ?>

+					$post_types = geodir_get_posttypes('object');

+					if (count((array)($post_types)) > 1) {

+						?>

                         <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

                              style="max-width:<?php echo $map_width;?>!important;">

 

@@ -391,15 +391,15 @@ 
                             <div class="geodir-map-posttype-list"><?php } ?>

                                 <ul class="clearfix place-list">

                                     <?php

-                                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+									$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

 

-                                    foreach ($post_types as $post_type => $args) {

-                                        if (!in_array($post_type, $exclude_post_types)) {

-                                            $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

+									foreach ($post_types as $post_type => $args) {

+										if (!in_array($post_type, $exclude_post_types)) {

+											$class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

 											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

-                                        }

-                                    }

-                                    ?>

+										}

+									}

+									?>

                                 </ul>

                                 <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             </div><?php } ?>

@@ -413,8 +413,8 @@ 
 

                         </div> <!-- map-places-listings-->

                     <?php }

-                } // end of post type filter if

-                ?>

+				} // end of post type filter if

+				?>

 

             </div>

         </div> <!--end of stick trigger container-->

@@ -429,8 +429,8 @@ 
         </script>

         <?php

 

-        if (strpos($geodir_map_options['height'], 'vh')) {

-            ?>

+		if (strpos($geodir_map_options['height'], 'vh')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -452,8 +452,8 @@ 
 

         <?php

 

-        } elseif (strpos($geodir_map_options['height'], 'px')) {

-            ?>

+		} elseif (strpos($geodir_map_options['height'], 'px')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -468,20 +468,20 @@ 
                 }());

             </script>

         <?php

-        }

+		}

 

-        /**

-         * Action that runs after all the map code has been output;

-         *

-         * @since 1.5.3

-         *

-         * @param array $geodir_map_options Array of map settings.

-         * @param string $map_canvas_name The canvas name and ID for the map.

-         */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+		/**

+		 * Action that runs after all the map code has been output;

+		 *

+		 * @since 1.5.3

+		 *

+		 * @param array $geodir_map_options Array of map settings.

+		 * @param string $map_canvas_name The canvas name and ID for the map.

+		 */

+		do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

 

 

-    endif; // Exclude posttypes if end

+	endif; // Exclude posttypes if end

 }

 

 ?>
\ No newline at end of file

Spacing +62 added lines, -62 removed lines

@@ -129,12 +129,12 @@ 
 

     if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

     } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+        $geodir_map_options['height'] = $geodir_map_options['height'].'px';

     }

 

     if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

     } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+        $geodir_map_options['width'] = $geodir_map_options['width'].'px';

     }

 

     /**

@@ -166,10 +166,10 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+    if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+        wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);

 

         wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

@@ -188,41 +188,41 @@ 
 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

-        <div id="catcher_<?php echo $map_canvas_name;?>"></div>

+        <div id="catcher_<?php echo $map_canvas_name; ?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

-            <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"

-                 id="sticky_map_<?php echo $map_canvas_name;?>"

-                 style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+            <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"

+                 id="sticky_map_<?php echo $map_canvas_name; ?>"

+                 style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

 

                 <div class="map_background">

                     <div class="top_banner_section_in clearfix">

-                        <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

-                        <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>

-                        <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"

-                             style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+                        <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

+                        <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>

+                        <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"

+                             style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

                             <!-- new map start -->

                             <div class="iprelative">

-                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"

-                                     style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

-                                <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"

-                                     style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

+                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"

+                                     style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

+                                <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"

+                                     style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

                                 <!--<div id="home_map_counter"></div>        -->

-                                <div id="<?php echo $map_canvas_name;?>_map_nofound"

+                                <div id="<?php echo $map_canvas_name; ?>_map_nofound"

                                      class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-                                <div id="<?php echo $map_canvas_name;?>_map_notloaded"

+                                <div id="<?php echo $map_canvas_name; ?>_map_notloaded"

                                      class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>

                             </div>

                             <!-- new map end -->

                         </div>

-                        <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>

+                        <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>

                     </div>

                 </div>

                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>

                 <?php } else {

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>

                 <?php }

 

                 if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

@@ -242,7 +242,7 @@ 
                            onclick="calcRoute('<?php echo $map_canvas_name; ?>')"/>

 

                     <script>

-                        <?php if(geodir_is_page('detail')){?>

+                        <?php if (geodir_is_page('detail')) {?>

                         jQuery(function () {

                             gd_initialize_ac();

                         });

@@ -253,7 +253,7 @@ 
                                 // Create the autocomplete object, restricting the search

                                 // to geographical location types.

                                 autocomplete = new google.maps.places.Autocomplete(

-                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),

+                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),

                                     {types: ['geocode']});

                                 // When the user selects an address from the dropdown,

                                 // populate the address fields in the form.

@@ -307,7 +307,7 @@ 
 				 */

 				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

 				?>

-                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

+                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

@@ -317,12 +317,12 @@ 
 					}

                     ?>

                     <div

-                        class="map-category-listing<?php echo $map_cat_class;?>">

+                        class="map-category-listing<?php echo $map_cat_class; ?>">

                         <div class="trigger triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

-                        <div id="<?php echo $map_canvas_name;?>_cat"

-                             class="<?php echo $map_canvas_name;?>_map_category  map_category"

-                             <?php if ($child_collapse){ ?>checked="checked" <?php }?>

-                             style="max-height:<?php echo $geodir_map_options['height'];?>;">

+                        <div id="<?php echo $map_canvas_name; ?>_cat"

+                             class="<?php echo $map_canvas_name; ?>_map_category  map_category"

+                             <?php if ($child_collapse) { ?>checked="checked" <?php }?>

+                             style="max-height:<?php echo $geodir_map_options['height']; ?>;">

                             <input

                                 onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"

                                 type="text"

@@ -334,11 +334,11 @@ 
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

                                     ?>

-                                    <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

+                                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

                                 <div class="toggle">

-                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>

+                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>

                                     <script>jQuery( document ).ready(function() {

                                             geodir_show_sub_cat_collapse_button();

                                         });</script>

@@ -367,21 +367,21 @@ 
 					$city = $country != 'me' ? $city : '';

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

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"

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

                 <?php } else { //end of location filter

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>

                 <?php }?>

 

-                <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>

+                <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>

 

                 <input type="hidden" name="limitstart" value=""/>

 

@@ -389,10 +389,10 @@ 
 

                 <?php if ($geodir_map_options['enable_post_type_filters']) {

                     $post_types = geodir_get_posttypes('object');

-                    if (count((array)($post_types)) > 1) {

+                    if (count((array) ($post_types)) > 1) {

                         ?>

-                        <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

-                             style="max-width:<?php echo $map_width;?>!important;">

+                        <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"

+                             style="max-width:<?php echo $map_width; ?>!important;">

 

                             <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             <div class="geodir-map-posttype-list"><?php } ?>

@@ -403,7 +403,7 @@ 
                                     foreach ($post_types as $post_type => $args) {

                                         if (!in_array($post_type, $exclude_post_types)) {

                                             $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

-											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

+											echo '<li id="'.$post_type.'" '.$class.'><a href="javascript:void(0);" onclick="jQuery(\'#'.$map_canvas_name.'_posttype\').val(\''.$post_type.'\');build_map_ajax_search_param(\''.$map_canvas_name.'\', true)">'.__(ucfirst($args->labels->name), 'geodirectory').'</a></li>';

                                         }

                                     }

                                     ?>

@@ -428,9 +428,9 @@ 
         <script type="text/javascript">

 

             jQuery(document).ready(function () {

-                //initMap('<?php echo $map_canvas_name;?>'); // depreciated, no need to load this twice

-                build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);

-                map_sticky('<?php echo $map_canvas_name;?>');

+                //initMap('<?php echo $map_canvas_name; ?>'); // depreciated, no need to load this twice

+                build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);

+                map_sticky('<?php echo $map_canvas_name; ?>');

             });

 

         </script>

@@ -441,18 +441,18 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";

 

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

+                    jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

 

                 }());

             </script>

@@ -464,13 +464,13 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');

 

                 }());

             </script>

@@ -485,7 +485,7 @@ 
          * @param array $geodir_map_options Array of map settings.

          * @param string $map_canvas_name The canvas name and ID for the map.

          */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+        do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);

 

 

     endif; // Exclude posttypes if end

geodirectory-functions/reviews.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
  * the visitor has not yet entered the password we will

  * return early without loading the comments.

  */

-if (post_password_required())

-    return;

+if (post_password_required()) {
+    return;
+}
 ?>

 

 <div id="comments" class="comments-area">

Indentation +53 added lines, -53 removed lines

@@ -17,7 +17,7 @@ 
  * return early without loading the comments.

  */

 if (post_password_required())

-    return;

+	return;

 ?>

 

 <div id="comments" class="comments-area">

@@ -25,35 +25,35 @@ 
     <?php // You can start editing here -- including this comment! ?>

 

     <?php

-    /**

-     * Called before displaying reviews.

-     *

-     * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_before_review_list'); ?>

+	/**

+	 * Called before displaying reviews.

+	 *

+	 * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_before_review_list'); ?>

 

     <?php if (have_comments()) : ?>

         <h2 class="comments-title">

             <?php

-            printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),

-                number_format_i18n(get_comments_number()), get_the_title());

-            ?>

+			printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">&ldquo;%2$s&rdquo;</span>', '%1$s Reviews <span>on</span> <span class="r-title"> &ldquo;%2$s&rdquo;</span>', get_comments_number(), 'geodirectory'),

+				number_format_i18n(get_comments_number()), get_the_title());

+			?>

         </h2>

 

         <?php

-        /**

-         * Called after displaying review listing title.

-         *

-         * @since 1.5.7

-         */

-        do_action('geodir_after_review_list_title'); ?>

+		/**

+		 * Called after displaying review listing title.

+		 *

+		 * @since 1.5.7

+		 */

+		do_action('geodir_after_review_list_title'); ?>

 

         <ol class="commentlist">

             <?php $reverse_top_level = is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php') ? false : null; ?>

 			<?php wp_list_comments(array('callback' => 'geodir_comment', 'reverse_top_level' => $reverse_top_level, 'style' => 'ol'));

-            ?>

+			?>

         </ol><!-- .commentlist -->

 

         <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>

@@ -68,51 +68,51 @@ 
         <?php endif; // check for comment navigation ?>

 

         <?php

-        /* If there are no comments and comments are closed, let's leave a note.

+		/* If there are no comments and comments are closed, let's leave a note.

          * But we only want the note on posts and pages that had comments in the first place.

          */

-        if (!comments_open() && get_comments_number()) : ?>

+		if (!comments_open() && get_comments_number()) : ?>

             <p class="nocomments"><?php _e('Reviews are closed.', 'geodirectory'); ?></p>

         <?php endif; ?>

 

     <?php endif; // have_comments() ?>

 

     <?php

-    /**

-     * Called before displaying "Leave a review form".

-     *

-     * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.

-     * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_before_review_form'); ?>

+	/**

+	 * Called before displaying "Leave a review form".

+	 *

+	 * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div.

+	 * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_before_review_form'); ?>

 

     <?php

-    /**

-     * Filters comment form args

-     *

-     * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.

-     *

-     * @since 1.0.0

-     */

-    $args = apply_filters('geodir_review_form_args', array(

-        'title_reply' => __('Leave a Review', 'geodirectory'),

-        'label_submit' => __('Post Review', 'geodirectory'),

-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

-    ));

-    comment_form($args);

-    ?>

+	/**

+	 * Filters comment form args

+	 *

+	 * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args.

+	 *

+	 * @since 1.0.0

+	 */

+	$args = apply_filters('geodir_review_form_args', array(

+		'title_reply' => __('Leave a Review', 'geodirectory'),

+		'label_submit' => __('Post Review', 'geodirectory'),

+		'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

+		'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

+	));

+	comment_form($args);

+	?>

 

     <?php

-    /**

-     * Called after displaying "Leave a review form".

-     *

-     * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.

-     *

-     * @since 1.5.7

-     */

-    do_action('geodir_after_review_form'); ?>

+	/**

+	 * Called after displaying "Leave a review form".

+	 *

+	 * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div.

+	 *

+	 * @since 1.5.7

+	 */

+	do_action('geodir_after_review_form'); ?>

 

 </div><!-- #comments .comments-area -->
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -99,8 +99,8 @@
     $args = apply_filters('geodir_review_form_args', array(

         'title_reply' => __('Leave a Review', 'geodirectory'),

         'label_submit' => __('Post Review', 'geodirectory'),

-        'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

-        'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'

+        'comment_field' => '<p class="comment-form-comment"><label for="comment">'.__('Review text', 'geodirectory').'</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',

+        'must_log_in' => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()).'</p>'

     ));

     comment_form($args);

     ?>

geodirectory-functions/wp-session/wp-session.php

Spacing +27 added lines, -27 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Return the current cache expire setting.
@@ -36,10 +36,10 @@ 
  *
  * @param string $data
  */
-function wp_session_decode( $data ) {
+function wp_session_decode($data) {
 	$wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+	return $wp_session->json_in($data);
 }
 
 /**
@@ -60,10 +60,10 @@ 
  *
  * @return bool
  */
-function wp_session_regenerate_id( $delete_old_session = false ) {
+function wp_session_regenerate_id($delete_old_session = false) {
 	$wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+	$wp_session->regenerate_id($delete_old_session);
 
 	return true;
 }
@@ -77,11 +77,11 @@ 
  */
 function wp_session_start() {
 	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+	do_action('wp_session_start');
 
 	return $wp_session->session_started();
 }
-add_action( 'plugins_loaded', 'wp_session_start' );
+add_action('plugins_loaded', 'wp_session_start');
 
 /**
  * Return the current session status.
@@ -91,7 +91,7 @@ 
 function wp_session_status() {
 	$wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
+	if ($wp_session->session_started()) {
 		return PHP_SESSION_ACTIVE;
 	}
 
@@ -114,9 +114,9 @@ 
 	$wp_session = WP_Session::get_instance();
 
 	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+	do_action('wp_session_commit');
 }
-add_action( 'shutdown', 'wp_session_write_close' );
+add_action('shutdown', 'wp_session_write_close');
 
 /**
  * Clean up expired sessions by removing data and their expiration entries from
@@ -128,51 +128,51 @@ 
 function wp_session_cleanup() {
 	global $wpdb;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+	if (defined('WP_SETUP_CONFIG')) {
 		return;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		$expiration_keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'" );
+	if (!defined('WP_INSTALLING')) {
+		$expiration_keys = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'");
 
-		$now = current_time( 'timestamp' );
+		$now = current_time('timestamp');
 		$expired_sessions = array();
 
-		foreach( $expiration_keys as $expiration ) {
+		foreach ($expiration_keys as $expiration) {
 
 			// If the session has expired
-			if ( $now > intval( $expiration->option_value ) ) {
+			if ($now > intval($expiration->option_value)) {
 
 				// Get the session ID by parsing the option_name
-				$session_id = substr( $expiration->option_name, 20 );
+				$session_id = substr($expiration->option_name, 20);
 
-				if( (int) -1 === (int) $session_id || ! preg_match( '/^[a-f0-9]{32}$/', $session_id ) ) {
+				if ((int) -1 === (int) $session_id || !preg_match('/^[a-f0-9]{32}$/', $session_id)) {
 					continue;
 				}
 
 				$expired_sessions[] = $expiration->option_name;
-				$expired_sessions[] = esc_sql( "_wp_session_$session_id" );
+				$expired_sessions[] = esc_sql("_wp_session_$session_id");
 			}
 		}
 
 		// Delete all expired sessions in a single query
-		if ( ! empty( $expired_sessions ) ) {
-			$option_names = implode( "','", $expired_sessions );
-			$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')"  );
+		if (!empty($expired_sessions)) {
+			$option_names = implode("','", $expired_sessions);
+			$wpdb->query("DELETE FROM $wpdb->options WHERE option_name IN ('$option_names')");
 		}
 	}
 
 	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+	do_action('wp_session_cleanup');
 }
-add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
+add_action('wp_session_garbage_collection', 'wp_session_cleanup');
 
 /**
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( current_time( 'timestamp' ), 'twicedaily', 'wp_session_garbage_collection' );
+	if (!wp_next_scheduled('wp_session_garbage_collection')) {
+		wp_schedule_event(current_time('timestamp'), 'twicedaily', 'wp_session_garbage_collection');
 	}
 }
-add_action( 'wp', 'wp_session_register_garbage_collection' );
+add_action('wp', 'wp_session_register_garbage_collection');

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

geodirectory-templates/listing-filter-form.php

Braces +9 added lines, -6 removed lines

@@ -50,16 +50,19 @@
                 <?php

 

                 $default_search_for_text = SEARCH_FOR_TEXT;

-                if (get_option('geodir_search_field_default_text'))

-                    $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+                if (get_option('geodir_search_field_default_text')) {
+                                    $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+                }
 

                 $default_near_text = NEAR_TEXT;

-                if (get_option('geodir_near_field_default_text'))

-                    $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+                if (get_option('geodir_near_field_default_text')) {
+                                    $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+                }
 

                 $default_search_button_label = __('Search', 'geodirectory');

-                if (get_option('geodir_search_button_label'))

-                    $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

+                if (get_option('geodir_search_button_label')) {
+                                    $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');
+                }
 

                 $post_types = geodir_get_posttypes('object');

 

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 

                 $post_types = geodir_get_posttypes('object');

 

-                if (!empty($post_types) && count((array)$post_types) > 1):

+                if (!empty($post_types) && count((array) $post_types) > 1):

                     ?>

                     <select name="stype" class="search_by_post">

                         <?php foreach ($post_types as $post_type => $info):

@@ -75,19 +75,19 @@ 
                             }

                             ?>

 

-                            <option data-label="<?php echo get_post_type_archive_link($post_type);?>"

-                                    value="<?php echo $post_type;?>" <?php if (isset($_REQUEST['stype'])) {

+                            <option data-label="<?php echo get_post_type_archive_link($post_type); ?>"

+                                    value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {

                                 if ($post_type == $_REQUEST['stype']) {

                                     echo 'selected="selected"';

                                 }

                             } elseif ($curr_post_type == $post_type) {

                                 echo 'selected="selected"';

-                            }?>><?php _e(ucfirst($info->labels->name), 'geodirectory');?></option>

+                            }?>><?php _e(ucfirst($info->labels->name), 'geodirectory'); ?></option>

 

                         <?php endforeach; ?>

                     </select>

                 <?php elseif (!empty($post_types)):

-                    echo '<input type="hidden" name="stype" value="' . key($post_types) . '"  />';

+                    echo '<input type="hidden" name="stype" value="'.key($post_types).'"  />';

                 endif; ?>

 

                 <input class="search_text" name="s"

@@ -157,7 +157,7 @@ 
                  * @since 1.5.5

                  * @param string $default_search_button_label The current search button text.

                  */

-                $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);?>

+                $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label); ?>

 				<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" class="geodir_submit_search" />

                 <?php

                 /**

Indentation +100 added lines, -100 removed lines

@@ -14,11 +14,11 @@ 
 

 $curr_post_type = geodir_get_current_posttype();

 if (function_exists('geodir_location_geo_home_link')) {

-    remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+	remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

 }

 $search_url = trailingslashit(get_home_url());

 if (function_exists('geodir_location_geo_home_link')) {

-    add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+	add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

 }

 ?>

 

@@ -37,104 +37,104 @@ 
     <div class="geodir-loc-bar">

 

         <?php

-        /**

-         * Called inside the search form but before any of the fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_search_form') ?>

+		/**

+		 * Called inside the search form but before any of the fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_search_form') ?>

 

         <div class="clearfix geodir-loc-bar-in">

             <div class="geodir-search">

 

                 <?php

 

-                $default_search_for_text = SEARCH_FOR_TEXT;

-                if (get_option('geodir_search_field_default_text'))

-                    $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+				$default_search_for_text = SEARCH_FOR_TEXT;

+				if (get_option('geodir_search_field_default_text'))

+					$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 

-                $default_near_text = NEAR_TEXT;

-                if (get_option('geodir_near_field_default_text'))

-                    $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+				$default_near_text = NEAR_TEXT;

+				if (get_option('geodir_near_field_default_text'))

+					$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 

-                $default_search_button_label = __('Search', 'geodirectory');

-                if (get_option('geodir_search_button_label'))

-                    $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

+				$default_search_button_label = __('Search', 'geodirectory');

+				if (get_option('geodir_search_button_label'))

+					$default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

 

-                $post_types = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

+				$post_types = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

 

-                if (!empty($post_types) && count((array)$post_types) > 1):

-                    ?>

+				if (!empty($post_types) && count((array)$post_types) > 1):

+					?>

                     <select name="stype" class="search_by_post">

                         <?php foreach ($post_types as $post_type => $info):

-                            global $wpdb;

-                            $has_posts = '';

-                            $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

-                            if (!$has_posts) {

-                                continue;

-                            }

-                            ?>

+							global $wpdb;

+							$has_posts = '';

+							$has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+							if (!$has_posts) {

+								continue;

+							}

+							?>

 

                             <option data-label="<?php echo get_post_type_archive_link($post_type);?>"

                                     value="<?php echo $post_type;?>" <?php if (isset($_REQUEST['stype'])) {

-                                if ($post_type == $_REQUEST['stype']) {

-                                    echo 'selected="selected"';

-                                }

-                            } elseif ($curr_post_type == $post_type) {

-                                echo 'selected="selected"';

-                            }?>><?php _e(ucfirst($info->labels->name), 'geodirectory');?></option>

+								if ($post_type == $_REQUEST['stype']) {

+									echo 'selected="selected"';

+								}

+							} elseif ($curr_post_type == $post_type) {

+								echo 'selected="selected"';

+							}?>><?php _e(ucfirst($info->labels->name), 'geodirectory');?></option>

 

                         <?php endforeach; ?>

                     </select>

                 <?php elseif (!empty($post_types)):

-                    echo '<input type="hidden" name="stype" value="' . key($post_types) . '"  />';

-                endif; ?>

+					echo '<input type="hidden" name="stype" value="' . key($post_types) . '"  />';

+				endif; ?>

 

                 <input class="search_text" name="s"

                        value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

-                           echo esc_attr(stripslashes_deep($_REQUEST['s']));

-                       } else {

-                           echo $default_search_for_text;

-                       } ?>" type="text"

+						   echo esc_attr(stripslashes_deep($_REQUEST['s']));

+					   } else {

+						   echo $default_search_for_text;

+					   } ?>" type="text"

                        onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"

                        onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"

                        onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

 

 

                 <?php

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

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

-                } else {

-                    $near = $default_near_text;

-                }

-                /**

-                 * Filter the "Near" text value for the search form.

-                 *

-                 * This is the input "value" attribute and can change depending on what the user searches and is not always the default value.

-                 *

-                 * @since 1.0.0

-                 * @param string $near The current near value.

-                 * @param string $default_near_text The default near value.

-                 */

-                $near = apply_filters('geodir_search_near_text', $near, $default_near_text);

-                /**

-                 * Filter the default "Near" text value for the search form.

-                 *

-                 * This is the default value if nothing has been searched.

-                 *

-                 * @since 1.0.0

-                 * @param string $near The current near value.

-                 * @param string $default_near_text The default near value.

-                 */

-                $default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

-                /**

-                 * Filter the class for the near search input.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The class for the HTML near input, default is blank.

-                 */

-                $near_class = apply_filters('geodir_search_near_class', '');

-                ?>

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

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

+				} else {

+					$near = $default_near_text;

+				}

+				/**

+				 * Filter the "Near" text value for the search form.

+				 *

+				 * This is the input "value" attribute and can change depending on what the user searches and is not always the default value.

+				 *

+				 * @since 1.0.0

+				 * @param string $near The current near value.

+				 * @param string $default_near_text The default near value.

+				 */

+				$near = apply_filters('geodir_search_near_text', $near, $default_near_text);

+				/**

+				 * Filter the default "Near" text value for the search form.

+				 *

+				 * This is the default value if nothing has been searched.

+				 *

+				 * @since 1.0.0

+				 * @param string $near The current near value.

+				 * @param string $default_near_text The default near value.

+				 */

+				$default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

+				/**

+				 * Filter the class for the near search input.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The class for the HTML near input, default is blank.

+				 */

+				$near_class = apply_filters('geodir_search_near_class', '');

+				?>

 

                 <input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"

                        onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"

@@ -142,42 +142,42 @@ 
                        onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"/>

 

                 <?php

-                /**

-                 * Called on the GD search form just before the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_before_search_button');

-

-                /**

-                 * Filter the default search button text value for the search form.

-                 *

-                 * This text can be changed via an option in settings, this is a last resort.

-                 *

-                 * @since 1.5.5

-                 * @param string $default_search_button_label The current search button text.

-                 */

-                $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);?>

+				/**

+				 * Called on the GD search form just before the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_before_search_button');

+

+				/**

+				 * Filter the default search button text value for the search form.

+				 *

+				 * This text can be changed via an option in settings, this is a last resort.

+				 *

+				 * @since 1.5.5

+				 * @param string $default_search_button_label The current search button text.

+				 */

+				$default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);?>

 				<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" class="geodir_submit_search" />

                 <?php

-                /**

-                 * Called on the GD search form just after the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_after_search_button'); ?>

+				/**

+				 * Called on the GD search form just after the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_after_search_button'); ?>

             </div>

 

 

         </div>

 

         <?php

-        /**

-         * Called inside the search form but after all the input fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_search_form') ?>

+		/**

+		 * Called inside the search form but after all the input fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_search_form') ?>

 

 

     </div>