GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/Google/IO/Abstract.php

Indentation +165 added lines, -165 removed lines

@@ -28,19 +28,19 @@ 
   const UNKNOWN_CODE = 0;
   const FORM_URLENCODED = 'application/x-www-form-urlencoded';
   private static $CONNECTION_ESTABLISHED_HEADERS = array(
-    "HTTP/1.0 200 Connection established\r\n\r\n",
-    "HTTP/1.1 200 Connection established\r\n\r\n",
+	"HTTP/1.0 200 Connection established\r\n\r\n",
+	"HTTP/1.1 200 Connection established\r\n\r\n",
   );
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
   private static $HOP_BY_HOP = array(
-    'connection' => true,
-    'keep-alive' => true,
-    'proxy-authenticate' => true,
-    'proxy-authorization' => true,
-    'te' => true,
-    'trailers' => true,
-    'transfer-encoding' => true,
-    'upgrade' => true
+	'connection' => true,
+	'keep-alive' => true,
+	'proxy-authenticate' => true,
+	'proxy-authorization' => true,
+	'te' => true,
+	'trailers' => true,
+	'transfer-encoding' => true,
+	'upgrade' => true
   );
 
 
@@ -49,11 +49,11 @@ 
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
-    $timeout = $client->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds');
-    if ($timeout > 0) {
-      $this->setTimeout($timeout);
-    }
+	$this->client = $client;
+	$timeout = $client->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds');
+	if ($timeout > 0) {
+	  $this->setTimeout($timeout);
+	}
   }
 
   /**
@@ -102,13 +102,13 @@ 
    */
   public function setCachedRequest(Google_Http_Request $request)
   {
-    // Determine if the request is cacheable.
-    if (Google_Http_CacheParser::isResponseCacheable($request)) {
-      $this->client->getCache()->set($request->getCacheKey(), $request);
-      return true;
-    }
+	// Determine if the request is cacheable.
+	if (Google_Http_CacheParser::isResponseCacheable($request)) {
+	  $this->client->getCache()->set($request->getCacheKey(), $request);
+	  return true;
+	}
 
-    return false;
+	return false;
   }
 
   /**
@@ -121,37 +121,37 @@ 
    */
   public function makeRequest(Google_Http_Request $request)
   {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false && $cached instanceof Google_Http_Request) {
-      if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
-        return $cached;
-      }
-    }
-
-    if (array_key_exists($request->getRequestMethod(), self::$ENTITY_HTTP_METHODS)) {
-      $request = $this->processEntityRequest($request);
-    }
-
-    list($responseData, $responseHeaders, $respHttpCode) = $this->executeRequest($request);
-
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      $this->updateCachedRequest($cached, $responseHeaders);
-      return $cached;
-    }
-
-    if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
-      $responseHeaders['date'] = date("r");
-    }
-
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($responseData);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    return $request;
+	// First, check to see if we have a valid cached version.
+	$cached = $this->getCachedRequest($request);
+	if ($cached !== false && $cached instanceof Google_Http_Request) {
+	  if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
+		return $cached;
+	  }
+	}
+
+	if (array_key_exists($request->getRequestMethod(), self::$ENTITY_HTTP_METHODS)) {
+	  $request = $this->processEntityRequest($request);
+	}
+
+	list($responseData, $responseHeaders, $respHttpCode) = $this->executeRequest($request);
+
+	if ($respHttpCode == 304 && $cached) {
+	  // If the server responded NOT_MODIFIED, return the cached request.
+	  $this->updateCachedRequest($cached, $responseHeaders);
+	  return $cached;
+	}
+
+	if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
+	  $responseHeaders['date'] = date("r");
+	}
+
+	$request->setResponseHttpCode($respHttpCode);
+	$request->setResponseHeaders($responseHeaders);
+	$request->setResponseBody($responseData);
+	// Store the request in cache (the function checks to see if the request
+	// can actually be cached)
+	$this->setCachedRequest($request);
+	return $request;
   }
 
   /**
@@ -162,11 +162,11 @@ 
    */
   public function getCachedRequest(Google_Http_Request $request)
   {
-    if (false === Google_Http_CacheParser::isRequestCacheable($request)) {
-      return false;
-    }
+	if (false === Google_Http_CacheParser::isRequestCacheable($request)) {
+	  return false;
+	}
 
-    return $this->client->getCache()->get($request->getCacheKey());
+	return $this->client->getCache()->get($request->getCacheKey());
   }
 
   /**
@@ -177,28 +177,28 @@ 
    */
   public function processEntityRequest(Google_Http_Request $request)
   {
-    $postBody = $request->getPostBody();
-    $contentType = $request->getRequestHeader("content-type");
-
-    // Set the default content-type as application/x-www-form-urlencoded.
-    if (false == $contentType) {
-      $contentType = self::FORM_URLENCODED;
-      $request->setRequestHeaders(array('content-type' => $contentType));
-    }
-
-    // Force the payload to match the content-type asserted in the header.
-    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
-      $postBody = http_build_query($postBody, '', '&');
-      $request->setPostBody($postBody);
-    }
-
-    // Make sure the content-length header is set.
-    if (!$postBody || is_string($postBody)) {
-      $postsLength = strlen($postBody);
-      $request->setRequestHeaders(array('content-length' => $postsLength));
-    }
-
-    return $request;
+	$postBody = $request->getPostBody();
+	$contentType = $request->getRequestHeader("content-type");
+
+	// Set the default content-type as application/x-www-form-urlencoded.
+	if (false == $contentType) {
+	  $contentType = self::FORM_URLENCODED;
+	  $request->setRequestHeaders(array('content-type' => $contentType));
+	}
+
+	// Force the payload to match the content-type asserted in the header.
+	if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
+	  $postBody = http_build_query($postBody, '', '&');
+	  $request->setPostBody($postBody);
+	}
+
+	// Make sure the content-length header is set.
+	if (!$postBody || is_string($postBody)) {
+	  $postsLength = strlen($postBody);
+	  $request->setRequestHeaders(array('content-length' => $postsLength));
+	}
+
+	return $request;
   }
 
   /**
@@ -211,21 +211,21 @@ 
    */
   protected function checkMustRevalidateCachedRequest($cached, $request)
   {
-    if (Google_Http_CacheParser::mustRevalidate($cached)) {
-      $addHeaders = array();
-      if ($cached->getResponseHeader('etag')) {
-        // [13.3.4] If an entity tag has been provided by the origin server,
-        // we must use that entity tag in any cache-conditional request.
-        $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
-      } elseif ($cached->getResponseHeader('date')) {
-        $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
-      }
-
-      $request->setRequestHeaders($addHeaders);
-      return true;
-    } else {
-      return false;
-    }
+	if (Google_Http_CacheParser::mustRevalidate($cached)) {
+	  $addHeaders = array();
+	  if ($cached->getResponseHeader('etag')) {
+		// [13.3.4] If an entity tag has been provided by the origin server,
+		// we must use that entity tag in any cache-conditional request.
+		$addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
+	  } elseif ($cached->getResponseHeader('date')) {
+		$addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
+	  }
+
+	  $request->setRequestHeaders($addHeaders);
+	  return true;
+	} else {
+	  return false;
+	}
   }
 
   /**
@@ -235,19 +235,19 @@ 
    */
   protected function updateCachedRequest($cached, $responseHeaders)
   {
-    $hopByHop = self::$HOP_BY_HOP;
-    if (!empty($responseHeaders['connection'])) {
-      $connectionHeaders = array_map(
-          'strtolower',
-          array_filter(
-              array_map('trim', explode(',', $responseHeaders['connection']))
-          )
-      );
-      $hopByHop += array_fill_keys($connectionHeaders, true);
-    }
-
-    $endToEnd = array_diff_key($responseHeaders, $hopByHop);
-    $cached->setResponseHeaders($endToEnd);
+	$hopByHop = self::$HOP_BY_HOP;
+	if (!empty($responseHeaders['connection'])) {
+	  $connectionHeaders = array_map(
+		  'strtolower',
+		  array_filter(
+			  array_map('trim', explode(',', $responseHeaders['connection']))
+		  )
+	  );
+	  $hopByHop += array_fill_keys($connectionHeaders, true);
+	}
+
+	$endToEnd = array_diff_key($responseHeaders, $hopByHop);
+	$cached->setResponseHeaders($endToEnd);
   }
 
   /**
@@ -259,33 +259,33 @@ 
    */
   public function parseHttpResponse($respData, $headerSize)
   {
-    // check proxy header
-    foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
-      if (stripos($respData, $established_header) !== false) {
-        // existed, remove it
-        $respData = str_ireplace($established_header, '', $respData);
-        // Subtract the proxy header size unless the cURL bug prior to 7.30.0
-        // is present which prevented the proxy header size from being taken into
-        // account.
-        if (!$this->needsQuirk()) {
-          $headerSize -= strlen($established_header);
-        }
-        break;
-      }
-    }
-
-    if ($headerSize) {
-      $responseBody = substr($respData, $headerSize);
-      $responseHeaders = substr($respData, 0, $headerSize);
-    } else {
-      $responseSegments = explode("\r\n\r\n", $respData, 2);
-      $responseHeaders = $responseSegments[0];
-      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
-                                                    null;
-    }
-
-    $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
-    return array($responseHeaders, $responseBody);
+	// check proxy header
+	foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
+	  if (stripos($respData, $established_header) !== false) {
+		// existed, remove it
+		$respData = str_ireplace($established_header, '', $respData);
+		// Subtract the proxy header size unless the cURL bug prior to 7.30.0
+		// is present which prevented the proxy header size from being taken into
+		// account.
+		if (!$this->needsQuirk()) {
+		  $headerSize -= strlen($established_header);
+		}
+		break;
+	  }
+	}
+
+	if ($headerSize) {
+	  $responseBody = substr($respData, $headerSize);
+	  $responseHeaders = substr($respData, 0, $headerSize);
+	} else {
+	  $responseSegments = explode("\r\n\r\n", $respData, 2);
+	  $responseHeaders = $responseSegments[0];
+	  $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
+													null;
+	}
+
+	$responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
+	return array($responseHeaders, $responseBody);
   }
 
   /**
@@ -295,45 +295,45 @@ 
    */
   public function getHttpResponseHeaders($rawHeaders)
   {
-    if (is_array($rawHeaders)) {
-      return $this->parseArrayHeaders($rawHeaders);
-    } else {
-      return $this->parseStringHeaders($rawHeaders);
-    }
+	if (is_array($rawHeaders)) {
+	  return $this->parseArrayHeaders($rawHeaders);
+	} else {
+	  return $this->parseStringHeaders($rawHeaders);
+	}
   }
 
   private function parseStringHeaders($rawHeaders)
   {
-    $headers = array();
-    $responseHeaderLines = explode("\r\n", $rawHeaders);
-    foreach ($responseHeaderLines as $headerLine) {
-      if ($headerLine && strpos($headerLine, ':') !== false) {
-        list($header, $value) = explode(': ', $headerLine, 2);
-        $header = strtolower($header);
-        if (isset($headers[$header])) {
-          $headers[$header] .= "\n" . $value;
-        } else {
-          $headers[$header] = $value;
-        }
-      }
-    }
-    return $headers;
+	$headers = array();
+	$responseHeaderLines = explode("\r\n", $rawHeaders);
+	foreach ($responseHeaderLines as $headerLine) {
+	  if ($headerLine && strpos($headerLine, ':') !== false) {
+		list($header, $value) = explode(': ', $headerLine, 2);
+		$header = strtolower($header);
+		if (isset($headers[$header])) {
+		  $headers[$header] .= "\n" . $value;
+		} else {
+		  $headers[$header] = $value;
+		}
+	  }
+	}
+	return $headers;
   }
 
   private function parseArrayHeaders($rawHeaders)
   {
-    $header_count = count($rawHeaders);
-    $headers = array();
-
-    for ($i = 0; $i < $header_count; $i++) {
-      $header = $rawHeaders[$i];
-      // Times will have colons in - so we just want the first match.
-      $header_parts = explode(': ', $header, 2);
-      if (count($header_parts) == 2) {
-        $headers[strtolower($header_parts[0])] = $header_parts[1];
-      }
-    }
-
-    return $headers;
+	$header_count = count($rawHeaders);
+	$headers = array();
+
+	for ($i = 0; $i < $header_count; $i++) {
+	  $header = $rawHeaders[$i];
+	  // Times will have colons in - so we just want the first match.
+	  $header_parts = explode(': ', $header, 2);
+	  if (count($header_parts) == 2) {
+		$headers[strtolower($header_parts[0])] = $header_parts[1];
+	  }
+	}
+
+	return $headers;
   }
 }

Spacing +3 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 abstract class Google_IO_Abstract
@@ -280,8 +280,7 @@ 
     } else {
       $responseSegments = explode("\r\n\r\n", $respData, 2);
       $responseHeaders = $responseSegments[0];
-      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
-                                                    null;
+      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] : null;
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
@@ -311,7 +310,7 @@ 
         list($header, $value) = explode(': ', $headerLine, 2);
         $header = strtolower($header);
         if (isset($headers[$header])) {
-          $headers[$header] .= "\n" . $value;
+          $headers[$header] .= "\n".$value;
         } else {
           $headers[$header] = $value;
         }

geodirectory-functions/compatibility/Twenty_Seventeen.php

Spacing +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 
-add_filter('post_thumbnail_html','geodir_2017_remove_header',10,5);
-function geodir_2017_remove_header($html, $post_ID, $post_thumbnail_id, $size, $attr){
-	if($size=='twentyseventeen-featured-image'){
+add_filter('post_thumbnail_html', 'geodir_2017_remove_header', 10, 5);
+function geodir_2017_remove_header($html, $post_ID, $post_thumbnail_id, $size, $attr) {
+	if ($size == 'twentyseventeen-featured-image') {
 
-		if(geodir_is_page('detail') || geodir_is_page('add-listing')){
-			$html = '';// nothing up top
+		if (geodir_is_page('detail') || geodir_is_page('add-listing')) {
+			$html = ''; // nothing up top
 		}
 
 	}
@@ -63,19 +63,19 @@ 
 
 }
 
-function geodir_twentyseventeen_body_classes($classes){
+function geodir_twentyseventeen_body_classes($classes) {
 
-	if(geodir_is_page('add-listing')
+	if (geodir_is_page('add-listing')
 	   || geodir_is_page('preview')
 	   || geodir_is_page('home')
 	   || geodir_is_page('location')
 	   || geodir_is_page('listing')
 	   || geodir_is_page('search')
 	   || geodir_is_page('author')
-	){
+	) {
 		$classes[] = 'has-sidebar';
 	}
 	return $classes;
 }
-add_filter( 'body_class', 'geodir_twentyseventeen_body_classes' );
+add_filter('body_class', 'geodir_twentyseventeen_body_classes');
 

Braces +4 added lines, -8 removed lines

@@ -46,17 +46,13 @@
 
 	if (is_page_geodir_home() || geodir_is_page('location')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
-	}
-	elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
-	}
-	elseif (geodir_is_page('detail')) {
+	} elseif (geodir_is_page('detail')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
-	}
-	elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('search')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
-	}
-	elseif (geodir_is_page('author')) {
+	} elseif (geodir_is_page('author')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
 	}
 

geodirectory-functions/map-functions/get_markers.php

Indentation +230 added lines, -230 removed lines

@@ -7,61 +7,61 @@ 
  */

  

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

-    global $gd_session;

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

-    $gd_session->set('homemap_catlist_ptype', $gd_post_type);

-    $post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

-    die;

+	global $gd_session;

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

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

+	$post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

 }

 

 /**

@@ -79,80 +79,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

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

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

@@ -209,125 +209,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

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

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

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

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

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

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

     die;

 }

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

 

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

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

             }

 

@@ -115,13 +115,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']."%";

     }

 

     /**

@@ -143,14 +143,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

@@ -170,14 +170,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

 	 *

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

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

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

                     }

                 }

 

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

         }

     }

@@ -325,7 +325,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"}]';

Braces +10 added lines, -8 removed lines

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

   

@@ -147,8 +149,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 ";

 

@@ -326,8 +329,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

geodirectory-admin/option-pages/create_field.php

Indentation +65 added lines, -65 removed lines

@@ -16,100 +16,100 @@
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    $response = godir_set_sort_field_order($field_ids);
-    if (is_array($response)) {
-        wp_send_json($response);
-    } else {
-        echo $response;
-    }
+	$response = godir_set_sort_field_order($field_ids);
+	if (is_array($response)) {
+		wp_send_json($response);
+	} else {
+		echo $response;
+	}
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -37,23 +37,23 @@ 
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_sort_field_delete($field_id);
@@ -61,11 +61,11 @@ 
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+        if (is_array($_REQUEST[$pkey]) || $pkey == 'default_value') {
             $tags = 'skip_field';
         } else {
             $tags = '';
@@ -80,7 +80,7 @@ 
 
     if (is_int($return)) {
         $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+        geodir_custom_field_adminhtml($field_type, $lastid, 'submit', $field_type_key);
     } else {
         echo $return;
     }
@@ -88,7 +88,7 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {

Braces +12 added lines, -8 removed lines

@@ -46,23 +46,26 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
@@ -88,8 +91,9 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {

geodirectory-functions/custom_field_html.php

Indentation +333 added lines, -333 removed lines

@@ -18,9 +18,9 @@ 
 global $post_type;

 

 if (!isset($field_info->post_type)) {

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

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

 } else

-    $post_type = $field_info->post_type;

+	$post_type = $field_info->post_type;

 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -48,7 +48,7 @@ 
 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+	$field_admin_title = $field_info->admin_title;

 

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

 

@@ -68,17 +68,17 @@ 
 //print_r($field_info);

 

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

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

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

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

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

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

 }else{

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

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

 }

 

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

-    $field_type_name = $cf['name'];

+	$field_type_name = $cf['name'];

 }else{

-    $field_type_name = $field_type;

+	$field_type_name = $field_type;

 }

 

 ?>

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

         <?php

 

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

-        ?>

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

+		?>

 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

@@ -98,37 +98,37 @@ 
                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

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

         <?php endif;

-        if ($field_type == 'fieldset') {

-            ?>

+		if ($field_type == 'fieldset') {

+			?>

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

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

             <b style="cursor:pointer;"

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

         <?php

-        } else {echo $field_icon;

-            ?>

+		} else {echo $field_icon;

+			?>

             <b style="cursor:pointer;"

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

         <?php

-        }

-        ?>

+		}

+		?>

     </div>

 

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

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

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

-             echo 'block;';

-         } else {

-             echo 'none;';

-         } ?>">

+			 echo 'block;';

+		 } else {

+			 echo 'none;';

+		 } ?>">

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

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

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

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

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

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

-            echo $field_info->data_type;

-        } ?>"/>

+			echo $field_info->data_type;

+		} ?>"/>

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

 

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

@@ -140,37 +140,37 @@ 
 

             <?php

 

-            // data_type

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

+			// data_type

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

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

             <?php

-            }

+			}

 

 

-            // admin_title

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

+			// admin_title

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

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

@@ -184,22 +184,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // site_title

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

+			// site_title

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

                         <div class="gdcf-tooltip">

@@ -212,22 +212,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // admin_desc

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

+			// admin_desc

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

                         <div class="gdcf-tooltip">

@@ -239,23 +239,23 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

 

-            // htmlvar_name

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

+			// htmlvar_name

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

                         <div class="gdcf-tooltip">

@@ -265,29 +265,29 @@ 
                     <div class="gd-cf-input-wrap">

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

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

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

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

-                            echo 'readonly="readonly"';

-                        }?> />

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

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

+							echo 'readonly="readonly"';

+						}?> />

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // is_active

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

+			// is_active

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li <?php echo $field_display; ?>>

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

                         <div class="gdcf-tooltip">

@@ -298,35 +298,35 @@ 
 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // for_admin_use

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

+			// for_admin_use

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

                     <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -337,47 +337,47 @@ 
 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // default_value

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

+			// default_value

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

                         <div class="gdcf-tooltip">

                             <?php

-                            if ($field_type == 'checkbox') {

-                                _e('Should the checkbox be checked by default?', 'geodirectory');

-                            } else if ($field_type == 'email') {

-                                _e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

-                            } else {

-                                _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

-                            }

-                            ?>

+							if ($field_type == 'checkbox') {

+								_e('Should the checkbox be checked by default?', 'geodirectory');

+							} else if ($field_type == 'email') {

+								_e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

+							} else {

+								_e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

+							}

+							?>

                         </div>

                     </label>

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

@@ -394,22 +394,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // show_in

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

+			// show_in

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

                     <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -420,41 +420,41 @@ 
 

                         <?php

 

-                        /*

+						/*

 						 * We wrap the key values in [] so we can search the DB easier with a LIKE query.

 						 */

-                        $show_in_locations = array(

-                            "[detail]" => __("Details page sidebar", 'geodirectory'),

-                            "[moreinfo]" => __("More info tab", 'geodirectory'),

-                            "[listing]" => __("Listings page", 'geodirectory'),

-                            "[owntab]" => __("Details page own tab", 'geodirectory'),

-                            "[mapbubble]" => __("Map bubble", 'geodirectory'),

-                        );

-

-                        /**

-                         * Filter the locations array for where to display custom fields.

-                         *

-                         * @since 1.6.6

-                         * @param array $show_in_locations The array of locations and descriptions.

-                         * @param object $field_info The field being displayed info.

-                         * @param string $field_info The type of field.

-                         */

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

-

-

-                        // remove some locations for some field types

-

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

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

-                        }else{

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

-                        }

-

-                        if(!$display_on_listing){

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

-                        }

-

-                        ?>

+						$show_in_locations = array(

+							"[detail]" => __("Details page sidebar", 'geodirectory'),

+							"[moreinfo]" => __("More info tab", 'geodirectory'),

+							"[listing]" => __("Listings page", 'geodirectory'),

+							"[owntab]" => __("Details page own tab", 'geodirectory'),

+							"[mapbubble]" => __("Map bubble", 'geodirectory'),

+						);

+

+						/**

+						 * Filter the locations array for where to display custom fields.

+						 *

+						 * @since 1.6.6

+						 * @param array $show_in_locations The array of locations and descriptions.

+						 * @param object $field_info The field being displayed info.

+						 * @param string $field_info The type of field.

+						 */

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

+

+

+						// remove some locations for some field types

+

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

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

+						}else{

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

+						}

+

+						if(!$display_on_listing){

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

+						}

+

+						?>

 

                         <select multiple="multiple" name="show_in[]"

                                 id="show_in"

@@ -464,38 +464,38 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

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

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

 

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

-                                $selected = '';

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

+								$selected = '';

 

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

-                                    $selected = 'selected';

-                                }

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

+									$selected = 'selected';

+								}

 

-                                ?>

+								?>

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

                                 <?php

-                            }

-                            ?>

+							}

+							?>

                         </select>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // advanced_editor

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

+			// advanced_editor

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

 

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

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

 

-            }

+			}

 

 

 

 

-            ?>

+			?>

 

 

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

@@ -508,38 +508,38 @@ 
 

             <?php

 

-            $pricearr = array();

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

-                $pricearr = explode(',', trim($field_info->packages, ','));

-            } else {

-                $package_info = array();

+			$pricearr = array();

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

+				$pricearr = explode(',', trim($field_info->packages, ','));

+			} else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $pricearr[] = $package_info->pid;

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$pricearr[] = $package_info->pid;

+			}

 

-            ob_start()

-            ?>

+			ob_start()

+			?>

 

             <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple">

                 <?php

-                if (!empty($pricearr)) {

-                    foreach ($pricearr as $val) {

-                        ?>

+				if (!empty($pricearr)) {

+					foreach ($pricearr as $val) {

+						?>

                         <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php

-                    }

-                }

-                ?>

+					}

+				}

+				?>

             </select>

 

             <?php

-            $html = ob_get_clean();

+			$html = ob_get_clean();

 

 			/**

 			 * Filter the price packages list.

 			 *

 			 * Filter the price packages list in custom field form in admin

-             * custom fields settings.

+			 * custom fields settings.

 			 *

 			 * @since 1.0.0

 			 *

@@ -548,25 +548,25 @@ 
 			 */

 			echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);

 

-            ?>

+			?>

 

 

 

             <?php

 

-            // is_required

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

+			// is_required

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

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

                         <div class="gdcf-tooltip">

@@ -578,14 +578,14 @@ 
 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

                     </div>

@@ -593,21 +593,21 @@ 
                 </li>

 

                 <?php

-            }

+			}

 

-            // required_msg

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

+			// required_msg

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

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

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

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

@@ -621,38 +621,38 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // required_msg

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

+			// required_msg

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

 

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

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

 

-            }

+			}

 

 

-            // extra_fields

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

+			// extra_fields

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

 

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

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

 

-            }

+			}

 

 

-            // field_icon

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

+			// field_icon

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

                     <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>

 

@@ -670,22 +670,22 @@ 
 

                 </li>

                 <?php

-            }

+			}

 

 

-            // css_class

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

+			// css_class

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

 

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

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

 

-            }else{

-                $value = '';

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

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

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

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

-                }

-                ?>

+			}else{

+				$value = '';

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

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

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

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

+				}

+				?>

                 <li>

 

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

@@ -698,47 +698,47 @@ 
                     <div class="gd-cf-input-wrap">

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

                                value="<?php if (isset($field_info->css_class)) {

-                                   echo esc_attr($field_info->css_class);

-                               }?>"/>

+								   echo esc_attr($field_info->css_class);

+							   }?>"/>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // cat_sort

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

+			// cat_sort

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

 

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

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

 

-            }else{

-                $value = '';

-                $hide_cat_sort  ='';

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

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

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

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

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

-                }

+			}else{

+				$value = '';

+				$hide_cat_sort  ='';

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

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

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

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

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

+				}

 

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

-                ?>

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

+				?>

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

                     <h3><?php

-                        /**

-                         * Filter the section title.

-                         *

-                         * Filter the section title in custom field form in admin

-                         * custom fields settings.

-                         *

-                         * @since 1.0.0

-                         *

-                         * @param string $title Title of the section.

-                         * @param string $field_type Current field type.

-                         */

-                        echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

-

-                        ?></h3>

+						/**

+						 * Filter the section title.

+						 *

+						 * Filter the section title in custom field form in admin

+						 * custom fields settings.

+						 *

+						 * @since 1.0.0

+						 *

+						 * @param string $title Title of the section.

+						 * @param string $field_type Current field type.

+						 */

+						echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

+

+						?></h3>

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

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

                         <div class="gdcf-tooltip">

@@ -750,42 +750,42 @@ 
 

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

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

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

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

                             <?php if (!$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

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

 

                     </div>

                 </li>

                 <?php

-            }

-

-

-

-            switch ($field_type):

-                case 'html':

-                case 'file':

-                case 'url':

-                case 'fieldset':

-                    break;

-                default:

-

-                    /**

-                     * Called at the end of the advanced custom fields settings page loop.

-                     *

-                     * Can be used to add or deal with different settings types.

-                     *

-                     * @since 1.0.0

-                     * @since 1.6.6 $cf param added.

-                     * @param object $field_info The current fields info.

-                     * @param array $cf The custom field settings

-                     */

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

+			}

+

+

+

+			switch ($field_type):

+				case 'html':

+				case 'file':

+				case 'url':

+				case 'fieldset':

+					break;

+				default:

+

+					/**

+					 * Called at the end of the advanced custom fields settings page loop.

+					 *

+					 * Can be used to add or deal with different settings types.

+					 *

+					 * @since 1.0.0

+					 * @since 1.6.6 $cf param added.

+					 * @param object $field_info The current fields info.

+					 * @param array $cf The custom field settings

+					 */

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

 

 

                 <?php endswitch; ?>

Spacing +124 added lines, -124 removed lines

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

 

 

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

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

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

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

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

 

 

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

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

 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

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

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

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

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

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

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

-}else{

+} else {

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

 }

 

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

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

     $field_type_name = $cf['name'];

-}else{

+} else {

     $field_type_name = $field_type;

 }

 

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

         <?php

 

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

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

         ?>

 

         <?php if ($default): ?>

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

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

             <b style="cursor:pointer;"

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

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

         <?php

         } else {echo $field_icon;

             ?>

             <b style="cursor:pointer;"

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

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

         <?php

         }

         ?>

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

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

 

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

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

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

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

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

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

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

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

 

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

 

             <?php

 

             // data_type

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

             <?php

             }

 

 

             // admin_title

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

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

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

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

                     </div>

                 </li>

                 <?php

@@ -188,15 +188,15 @@ 
 

 

             // site_title

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -216,15 +216,15 @@ 
 

 

             // admin_desc

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

                     </label>

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

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

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

                     </div>

                 </li>

                 <?php

@@ -244,26 +244,26 @@ 
 

 

             // htmlvar_name

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

                 <li>

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

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

                         <div class="gdcf-tooltip">

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

                         </div>

                     </label>

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

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

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

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

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

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

@@ -276,15 +276,15 @@ 
 

 

             // is_active

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

@@ -315,15 +315,15 @@ 
 

 

             // for_admin_use

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

@@ -354,20 +354,20 @@ 
 

 

             // default_value

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

                 <li>

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

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

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

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

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

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

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

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

                             </select>

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

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

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

                         <?php } else { ?>

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

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

                         <?php } ?>

                     </div>

                 </li>

@@ -398,15 +398,15 @@ 
 

 

             // show_in

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

                          * @param string $field_info The type of field.

                          */

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

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

 

 

                         // remove some locations for some field types

 

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

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

-                        }else{

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

+                        } else {

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

                         }

 

-                        if(!$display_on_listing){

+                        if (!$display_on_listing) {

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

                         }

 

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

                             <?php

 

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

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

 

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

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

                                 $selected = '';

 

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

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

                                     $selected = 'selected';

                                 }

 

                                 ?>

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

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

                                 <?php

                             }

                             ?>

@@ -486,9 +486,9 @@ 
 

 

             // advanced_editor

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

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

 

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

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

 

             }

 

@@ -499,10 +499,10 @@ 
 

 

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

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

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

 

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

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

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

 

 

 

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

 

             // is_required

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -576,17 +576,17 @@ 
 

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

 

@@ -596,19 +596,19 @@ 
             }

 

             // required_msg

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

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

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

                         <div class="gdcf-tooltip">

@@ -625,31 +625,31 @@ 
 

 

             // required_msg

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

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

 

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

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

 

             }

 

 

             // extra_fields

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

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

 

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

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

 

             }

 

 

             // field_icon

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

                         <div class="gdcf-tooltip">

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

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

                         </div>

                     </label>

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

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

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

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

                     </div>

 

                 </li>

@@ -674,15 +674,15 @@ 
 

 

             // css_class

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

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

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

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

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

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

                 }

                 ?>

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

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

                         <div class="gdcf-tooltip">

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

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

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

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

                         </div>

                     </label>

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

@@ -707,23 +707,23 @@ 
 

 

             // cat_sort

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

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

 

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

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

 

-            }else{

+            } else {

                 $value = '';

-                $hide_cat_sort  ='';

+                $hide_cat_sort = '';

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

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

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

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

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

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

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

                 }

 

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

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

                 ?>

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

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

                     <h3><?php

                         /**

                          * Filter the section title.

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

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

                         <div class="gdcf-tooltip">

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

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

                         </div>

                     </label>

 

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

 

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

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

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

                                 echo 'checked';

                             } ?>/>

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

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

 

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

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

                             <?php if (!$value) {

                                 echo 'checked';

                             } ?>/>

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

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

 

                     </div>

                 </li>

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

                      * @param array $cf The custom field settings

                      */

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

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

 

 

                 <?php endswitch; ?>

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

                 </label>

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

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

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

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

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

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

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

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

                                                             class="button"/></a>

                     <?php endif; ?>

Braces +43 added lines, -38 removed lines

@@ -19,8 +19,9 @@ 
 

 if (!isset($field_info->post_type)) {

     $post_type = sanitize_text_field($_REQUEST['listing_type']);

-} else

-    $post_type = $field_info->post_type;

+} else {
+    $post_type = $field_info->post_type;
+}
 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -47,8 +48,9 @@ 
 $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

 $field_admin_title = '';

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

-    $field_admin_title = $field_info->admin_title;

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

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

 

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

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

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

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

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

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

-}else{

+} else{

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

 }

 

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

     $field_type_name = $cf['name'];

-}else{

+} else{

     $field_type_name = $field_type;

 }

 

@@ -93,8 +95,11 @@ 
 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

-        <?php else: ?>

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

+        <?php else {
+	: ?>

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

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

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

         <?php endif;

@@ -145,11 +150,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -163,11 +168,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -192,11 +197,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -220,11 +225,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -248,11 +253,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -280,11 +285,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -319,11 +324,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -358,11 +363,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -402,11 +407,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -446,7 +451,7 @@ 
 

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

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

-                        }else{

+                        } else{

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

                         }

 

@@ -559,11 +564,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -600,11 +605,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -645,11 +650,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -678,11 +683,11 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

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

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

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

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

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

                 }

                 ?>

@@ -711,12 +716,12 @@ 
 

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

 

-            }else{

+            } else{

                 $value = '';

                 $hide_cat_sort  ='';

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

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

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

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

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

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

                 }

geodirectory_template_actions.php

Braces +31 added lines, -24 removed lines

@@ -715,8 +715,9 @@ 
 

                         if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

                             if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

+                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') {
+                                                                    $term_icon = $term_icon_url['src'];
+                                }
                                 break;

                             }

                         }

@@ -1265,8 +1266,9 @@ 
         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type . '_tags'])) {
+            echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';
+    }
 

     ?>

     </p><?php

@@ -1634,23 +1636,21 @@ 
     if(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

         if (strpos($current_term->taxonomy,'_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2074,8 +2074,9 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

+    if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') {
+            $listing_type = sanitize_text_field($_REQUEST['listing_type']);
+    }
     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

@@ -2087,7 +2088,7 @@ 
         $gd_page = 'add-listing';

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        } elseif(isset($listing_type)){

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2406,8 +2407,9 @@ 
         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

             $post = (object)$gd_session->get('listing');

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+            if (isset($post->post_images)) {
+                            $curImages = trim($post->post_images, ",");
+            }
 

 

             if ($curImages != '') {

@@ -2435,10 +2437,13 @@ 
             $totImg = count((array)$thumb_img_arr);

         }

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

+        if ($curImages != '') {
+                    $svalue = $curImages;
+        }
+        // this will be initial value of the above form field. Image urls.

+        else {
+                    $svalue = '';
+        }
 

         $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

         $show_image_input_box = ($image_limit != '0');

@@ -2648,8 +2653,9 @@ 
     </script><?php

 

     global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

+    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') {
+            $errors->add('claim_login', LOGIN_CLAIM);
+    }
 

     if (!empty($errors)) {

         foreach ($errors as $errorsObj) {

@@ -2753,8 +2759,9 @@ 
 

     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+        if (!empty($current_term)) {
+                    $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
+        }
     }

 

 

@@ -2772,7 +2779,7 @@ 
         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

Indentation +1838 added lines, -1838 removed lines

@@ -17,10 +17,10 @@ 
  */

 function gd_compat_styles()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<style id='gd-compat-styles' type='text/css'>";

-    echo $tc['geodir_theme_compat_css'];

-    echo "</style>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<style id='gd-compat-styles' type='text/css'>";

+	echo $tc['geodir_theme_compat_css'];

+	echo "</style>";

 }

 

 /**

@@ -31,10 +31,10 @@ 
  */

 function gd_compat_script()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<script>";

-    echo $tc['geodir_theme_compat_js'];

-    echo " </script>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<script>";

+	echo $tc['geodir_theme_compat_js'];

+	echo " </script>";

 }

 

 /**

@@ -47,8 +47,8 @@ 
  */

 function geodir_top_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_top_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_top_content_add'];

 }

 

 /**

@@ -61,8 +61,8 @@ 
  */

 function geodir_before_main_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_before_main_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_before_main_content_add'];

 }

 

 /**

@@ -75,8 +75,8 @@ 
  */

 function geodir_full_page_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_full_page_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_full_page_class_filter'];

 }

 

 /**

@@ -89,8 +89,8 @@ 
  */

 function geodir_before_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_widget_filter'];

 }

 

 /**

@@ -103,8 +103,8 @@ 
  */

 function geodir_after_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_widget_filter'];

 }

 

 /**

@@ -117,8 +117,8 @@ 
  */

 function geodir_before_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_title_filter'];

 }

 

 /**

@@ -131,8 +131,8 @@ 
  */

 function geodir_after_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_title_filter'];

 }

 

 /**

@@ -145,8 +145,8 @@ 
  */

 function geodir_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_li_class_filter'];

 }

 

 /**

@@ -159,8 +159,8 @@ 
  */

 function geodir_sub_menu_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_ul_class_filter'];

 }

 

 /**

@@ -173,8 +173,8 @@ 
  */

 function geodir_sub_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_li_class_filter'];

 }

 

 /**

@@ -187,8 +187,8 @@ 
  */

 function geodir_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_a_class_filter'];

 }

 

 /**

@@ -201,8 +201,8 @@ 
  */

 function geodir_sub_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_a_class_filter'];

 }

 

 /**

@@ -215,8 +215,8 @@ 
  */

 function geodir_location_switcher_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_li_class_filter'];

 }

 

 /**

@@ -229,8 +229,8 @@ 
  */

 function geodir_location_switcher_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_a_class_filter'];

 }

 

 /**

@@ -243,8 +243,8 @@ 
  */

 function geodir_location_switcher_menu_sub_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

 }

 

 /**

@@ -257,8 +257,8 @@ 
  */

 function geodir_location_switcher_menu_sub_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

 }

 

 

@@ -275,107 +275,107 @@ 
 function geodir_content_actions_dynamic()

 {

 

-    $tc = get_option('theme_compatibility_setting');

+	$tc = get_option('theme_compatibility_setting');

 //print_r($tc);

-    if (empty($tc)) {

-        return;

-    }

-

-    //php

-    if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

-    }

-

-    //geodir_full_page_class

-    if (!empty($tc['geodir_full_page_class_filter'])) {

-        add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

-    }

-

-    //widget before filter

-    if (!empty($tc['geodir_before_widget_filter'])) {

-        add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

-    }

-

-    //widget after filter

-    if (!empty($tc['geodir_after_widget_filter'])) {

-        add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_before_title_filter'])) {

-        add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_after_title_filter'])) {

-        add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

-    }

-

-    //menu li class

-    if (!empty($tc['geodir_menu_li_class_filter'])) {

-        add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

-    }

-

-    //menu ul class

-    if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

-        add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

-    }

-

-    //menu sub li class

-    if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

-        add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

-    }

-

-    //menu a class

-    if (!empty($tc['geodir_menu_a_class_filter'])) {

-        add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

-    }

-

-    //menu sub a class

-    if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

-        add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

-    }

-

-    //location menu li class

-    if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

-    }

-

-    //location menu sub ul class

-    if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

-    }

-

-    //location menu sub li class

-    if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

-    }

-

-    //location menu a class

-    if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

-    }

-

-    // compat styles

-    if (!empty($tc['geodir_theme_compat_css'])) {

-        add_action('wp_head', 'gd_compat_styles');

-    }

-

-    // compat js

-    if (!empty($tc['geodir_theme_compat_js'])) {

-        add_action('wp_footer', 'gd_compat_script');

-    }

-

-

-    // geodir_top_content_add

-    if (!empty($tc['geodir_top_content_add'])) {

-        add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

-    }

-

-    // geodir_before_main_content_add

-    if (!empty($tc['geodir_before_main_content_add'])) {

-        add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

-    }

+	if (empty($tc)) {

+		return;

+	}

+

+	//php

+	if (!empty($tc['geodir_theme_compat_code'])) {

+		include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+	}

+

+	//geodir_full_page_class

+	if (!empty($tc['geodir_full_page_class_filter'])) {

+		add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

+	}

+

+	//widget before filter

+	if (!empty($tc['geodir_before_widget_filter'])) {

+		add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

+	}

+

+	//widget after filter

+	if (!empty($tc['geodir_after_widget_filter'])) {

+		add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_before_title_filter'])) {

+		add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_after_title_filter'])) {

+		add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

+	}

+

+	//menu li class

+	if (!empty($tc['geodir_menu_li_class_filter'])) {

+		add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

+	}

+

+	//menu ul class

+	if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

+		add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

+	}

+

+	//menu sub li class

+	if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

+		add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

+	}

+

+	//menu a class

+	if (!empty($tc['geodir_menu_a_class_filter'])) {

+		add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

+	}

+

+	//menu sub a class

+	if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

+		add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

+	}

+

+	//location menu li class

+	if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

+	}

+

+	//location menu sub ul class

+	if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

+	}

+

+	//location menu sub li class

+	if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

+	}

+

+	//location menu a class

+	if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

+	}

+

+	// compat styles

+	if (!empty($tc['geodir_theme_compat_css'])) {

+		add_action('wp_head', 'gd_compat_styles');

+	}

+

+	// compat js

+	if (!empty($tc['geodir_theme_compat_js'])) {

+		add_action('wp_footer', 'gd_compat_script');

+	}

+

+

+	// geodir_top_content_add

+	if (!empty($tc['geodir_top_content_add'])) {

+		add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

+	}

+

+	// geodir_before_main_content_add

+	if (!empty($tc['geodir_before_main_content_add'])) {

+		add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

+	}

 

 

 }

@@ -398,23 +398,23 @@ 
  */

 function geodir_action_wrapper_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_open_replace'])) {

-        $text = $tc['geodir_wrapper_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_open_replace'])) {

+		$text = $tc['geodir_wrapper_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]">';

+	}

 

-    if (!empty($tc['geodir_wrapper_open_id'])) {

-        $id = $tc['geodir_wrapper_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_open_class'])) {

-        $class = $tc['geodir_wrapper_open_class'];

-    }

+	if (!empty($tc['geodir_wrapper_open_id'])) {

+		$id = $tc['geodir_wrapper_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_open_class'])) {

+		$class = $tc['geodir_wrapper_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the wrapperdiv closing tag

@@ -429,14 +429,14 @@ 
  */

 function geodir_action_wrapper_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_close_replace'])) {

-        $text = $tc['geodir_wrapper_close_replace'];

-    } else {

-        $text = '</div><!-- wrapper ends here-->';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_close_replace'])) {

+		$text = $tc['geodir_wrapper_close_replace'];

+	} else {

+		$text = '</div><!-- wrapper ends here-->';

+	}

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the content div opening tag

@@ -452,35 +452,35 @@ 
  */

 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_open_replace'])) {

-        $text = $tc['geodir_wrapper_content_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]" role="main" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_wrapper_content_open_id'])) {

-        $id = $tc['geodir_wrapper_content_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_content_open_class'])) {

-        $class = $tc['geodir_wrapper_content_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_open_replace'])) {

+		$text = $tc['geodir_wrapper_content_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]" role="main" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_wrapper_content_open_id'])) {

+		$id = $tc['geodir_wrapper_content_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_content_open_class'])) {

+		$class = $tc['geodir_wrapper_content_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -494,13 +494,13 @@ 
  */

 function geodir_action_wrapper_content_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_close_replace'])) {

-        $text = $tc['geodir_wrapper_content_close_replace'];

-    } else {

-        $text = '</div><!-- content ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_close_replace'])) {

+		$text = $tc['geodir_wrapper_content_close_replace'];

+	} else {

+		$text = '</div><!-- content ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the <article> opening tag

@@ -518,24 +518,24 @@ 
  */

 function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    $class = implode(" ", $class);

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_open_replace'])) {

-        $text = $tc['geodir_article_open_replace'];

-    } else {

-        $text = '<article  id="[id]" class="[class]" >';

-    }

+	$class = implode(" ", $class);

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_open_replace'])) {

+		$text = $tc['geodir_article_open_replace'];

+	} else {

+		$text = '<article  id="[id]" class="[class]" >';

+	}

 

-    if (!empty($tc['geodir_article_open_id'])) {

-        $id = $tc['geodir_article_open_id'];

-    }

-    if (!empty($tc['geodir_article_open_class'])) {

-        $class = $tc['geodir_article_open_class'];

-    }

+	if (!empty($tc['geodir_article_open_id'])) {

+		$id = $tc['geodir_article_open_id'];

+	}

+	if (!empty($tc['geodir_article_open_class'])) {

+		$class = $tc['geodir_article_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

+	$text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -549,13 +549,13 @@ 
  */

 function geodir_action_article_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_close_replace'])) {

-        $text = $tc['geodir_article_close_replace'];

-    } else {

-        $text = '</article><!-- article ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_close_replace'])) {

+		$text = $tc['geodir_article_close_replace'];

+	} else {

+		$text = '</article><!-- article ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the sidebar opening tag

@@ -572,35 +572,35 @@ 
  */

 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_open_replace'])) {

-        $text = $tc['geodir_sidebar_right_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_right_open_id'])) {

-        $id = $tc['geodir_sidebar_right_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_right_open_class'])) {

-        $class = $tc['geodir_sidebar_right_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_open_replace'])) {

+		$text = $tc['geodir_sidebar_right_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_right_open_id'])) {

+		$id = $tc['geodir_sidebar_right_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_right_open_class'])) {

+		$class = $tc['geodir_sidebar_right_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -614,13 +614,13 @@ 
  */

 function geodir_action_sidebar_right_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_close_replace'])) {

-        $text = $tc['geodir_sidebar_right_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_close_replace'])) {

+		$text = $tc['geodir_sidebar_right_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 

@@ -641,121 +641,121 @@ 
  */

 function geodir_action_geodir_set_preview_post()

 {

-    global $post, $preview, $gd_session;

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

-

-    $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

-

-    $fields_info = geodir_get_custom_fields_type($listing_type);

-

-    foreach ($_REQUEST as $pkey => $pval) {

-        if ($pkey == 'geodir_video') {

-            $tags = '<iframe>';

-        } else if ($pkey == 'post_desc') {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($_REQUEST[$pkey])) {

-            $tags = 'skip_field';

-        } else {

-            $tags = '';

-        }

-        /**

-         * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

-         *

-         * @since 1.0.0

-         * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

-         * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

-         */

-        $tags = apply_filters('geodir_save_post_key', $tags, $pkey);

-

-        if ($tags != 'skip_field') {

-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

-        }

-    }

-

-    $post = (object)$_REQUEST;

-

-

-    if (isset($post->video)) {

-        $post->video = stripslashes($post->video);

-    }

-

-    if (isset($post->Video2)) {

-        $post->Video2 = stripslashes($post->Video2);

-    }

-

-    $post_type = $post->listing_type;

-    $post_type_info = get_post_type_object($post_type);

-

-    $listing_label = $post_type_info->labels->singular_name;

-

-    $term_icon = '';

-

-    if (!empty($post->post_category)) {

-        foreach ($post->post_category as $post_taxonomy => $post_term) {

-

-            if ($post_term != '' && !is_array($post_term)) {

-                $post_term = explode(',', trim($post_term, ','));

-            }

+	global $post, $preview, $gd_session;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

+

+	$listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+

+	$fields_info = geodir_get_custom_fields_type($listing_type);

+

+	foreach ($_REQUEST as $pkey => $pval) {

+		if ($pkey == 'geodir_video') {

+			$tags = '<iframe>';

+		} else if ($pkey == 'post_desc') {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($_REQUEST[$pkey])) {

+			$tags = 'skip_field';

+		} else {

+			$tags = '';

+		}

+		/**

+		 * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

+		 *

+		 * @since 1.0.0

+		 * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

+		 * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

+		 */

+		$tags = apply_filters('geodir_save_post_key', $tags, $pkey);

+

+		if ($tags != 'skip_field') {

+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

+		}

+	}

+

+	$post = (object)$_REQUEST;

+

+

+	if (isset($post->video)) {

+		$post->video = stripslashes($post->video);

+	}

+

+	if (isset($post->Video2)) {

+		$post->Video2 = stripslashes($post->Video2);

+	}

+

+	$post_type = $post->listing_type;

+	$post_type_info = get_post_type_object($post_type);

+

+	$listing_label = $post_type_info->labels->singular_name;

+

+	$term_icon = '';

+

+	if (!empty($post->post_category)) {

+		foreach ($post->post_category as $post_taxonomy => $post_term) {

+

+			if ($post_term != '' && !is_array($post_term)) {

+				$post_term = explode(',', trim($post_term, ','));

+			}

 

-            if (is_array($post_term)) {

-                $post_term = array_unique($post_term);

-            }

+			if (is_array($post_term)) {

+				$post_term = array_unique($post_term);

+			}

 

-            if (!empty($post_term)) {

-                foreach ($post_term as $cat_id) {

-                    $cat_id = trim($cat_id);

-

-                    if ($cat_id != '') {

-                        $term_icon = get_option('geodir_default_marker_icon');

-

-                        if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

-                            if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-        }

-    }

+			if (!empty($post_term)) {

+				foreach ($post_term as $cat_id) {

+					$cat_id = trim($cat_id);

+

+					if ($cat_id != '') {

+						$term_icon = get_option('geodir_default_marker_icon');

+

+						if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

+							if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

+								if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

+									$term_icon = $term_icon_url['src'];

+								break;

+							}

+						}

+					}

+				}

+			}

+		}

+	}

 

-    $post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

-    $post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+	$post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

+	$post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

 

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

-    $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

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

+	$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

 

-    $json_title = str_replace($srcharr, $replarr, $post->post_title);

+	$json_title = str_replace($srcharr, $replarr, $post->post_title);

 

-    $json = '{';

-    $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

-    $json .= '}';

+	$json = '{';

+	$json .= '"post_preview": "1",';

+	$json .= '"t": "' . $json_title . '",';

+	$json .= '"lt": "' . $post_latitude . '",';

+	$json .= '"ln": "' . $post_longitude . '",';

+	$json .= '"i":"' . $term_icon . '"';

+	$json .= '}';

 

-    $post->marker_json = $json;

+	$post->marker_json = $json;

 

-    $gd_session->set('listing', $_REQUEST);

+	$gd_session->set('listing', $_REQUEST);

 

-    // we need to define a few things to trick the setup_postdata

-    if (!isset($post->ID)) {

-        $post->ID = '';

-        $post->post_author = '';

-        $post->post_date = '';

-        $post->post_content = '';

-        $post->default_category = '';

-        $post->post_type = '';

-    }

-    setup_postdata($post);

+	// we need to define a few things to trick the setup_postdata

+	if (!isset($post->ID)) {

+		$post->ID = '';

+		$post->post_author = '';

+		$post->post_date = '';

+		$post->post_content = '';

+		$post->default_category = '';

+		$post->post_type = '';

+	}

+	setup_postdata($post);

 }

 

 /**

@@ -767,15 +767,15 @@ 
  */

 function geodir_action_geodir_preview_code()

 {

-    global $preview;

+	global $preview;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

 

-    geodir_get_template_part('preview', 'buttons');

+	geodir_get_template_part('preview', 'buttons');

 }

 

 // action for adding the details page top widget area

@@ -791,20 +791,20 @@ 
  */

 function geodir_action_geodir_sidebar_detail_top($class = '')

 {

-    if (get_option('geodir_show_detail_top_section')) { ?>

+	if (get_option('geodir_show_detail_top_section')) { ?>

         <div

             class="<?php

-            /**

-             * Filter the div class for the wrapper of the full width widget areas.

-             *

-             * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

-             *

-             * @since 1.0.0

-             * @param string $class The class of the div.

-             * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

-             *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

-             */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

+			/**

+			 * Filter the div class for the wrapper of the full width widget areas.

+			 *

+			 * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

+			 *

+			 * @since 1.0.0

+			 * @param string $class The class of the div.

+			 * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

+			 *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

+			 */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_top'); ?>

         </div>

     <?php }

@@ -828,11 +828,11 @@ 
  */

 function geodir_action_geodir_sidebar_detail_bottom_section($class = '')

 {

-    if (get_option('geodir_show_detail_bottom_section')) { ?>

+	if (get_option('geodir_show_detail_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -846,7 +846,7 @@ 
  */

 function geodir_details_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_detail_sidebar');

+	dynamic_sidebar('geodir_detail_sidebar');

 }

 

 /**

@@ -857,12 +857,12 @@ 
  */

 function geodir_details_sidebar_place_details()

 {

-    /**

-     * Used to add items to the details page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_detail_page_sidebar');

+	/**

+	 * Used to add items to the details page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_detail_page_sidebar');

 }

 

 add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);

@@ -877,68 +877,68 @@ 
  */

 function geodir_action_details_sidebar()

 {

-    // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-    if (get_option('geodir_detail_sidebar_left_section')) {

-        /**

-         * Called before the details page left sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

-        ?>

+	// this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

+	if (get_option('geodir_detail_sidebar_left_section')) {

+		/**

+		 * Called before the details page left sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-left geodir-sidebar-wrap"><?php

-        /**

-         * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

-         *

-         * This is used to add all info to the details page sidebars.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-left --><?php

-        /**

-         * Called after the details page left sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_left_close', 'details-page');

-    } else {

-        /**

-         * Called before the details page right sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

-        ?>

+		/**

+		 * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

+		 *

+		 * This is used to add all info to the details page sidebars.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-left --><?php

+		/**

+		 * Called after the details page left sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_left_close', 'details-page');

+	} else {

+		/**

+		 * Called before the details page right sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-right geodir-sidebar-wrap"><?php

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-right --><?php

-        /**

-         * Called after the details page right sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_right_close', 'details-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-right --><?php

+		/**

+		 * Called after the details page right sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_right_close', 'details-page');

+	}

 }

 

 add_action('geodir_page_title', 'geodir_action_page_title', 10);

@@ -952,21 +952,21 @@ 
  */

 function geodir_action_page_title()

 {

-    /**

-     * Filter the page title HTML h1 class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-title fn'.

-     */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /**

-     * Filter the page title HTML header wrapper class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-header'.

-     */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+	/**

+	 * Filter the page title HTML h1 class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-title fn'.

+	 */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/**

+	 * Filter the page title HTML header wrapper class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-header'.

+	 */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

 }

 

 

@@ -983,94 +983,94 @@ 
  */

 function geodir_action_details_slider()

 {

-    global $preview, $post;

+	global $preview, $post;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

 

-    if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

-        $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

+		$preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-        $preview_post_images = array();

-        if ($preview_get_images) {

-            foreach ($preview_get_images as $row) {

-                $preview_post_images[] = $row->src;

-            }

-        }

-        if (!empty($preview_post_images)) {

-            $post->post_images = implode(',', $preview_post_images);

-        }

-    }

-

-    if ($preview) {

-        $post_images = array();

-        if (isset($post->post_images) && !empty($post->post_images)) {

-            $post->post_images = trim($post->post_images, ",");

-            $post_images = explode(",", $post->post_images);

-        }

-

-        $main_slides = '';

-        $nav_slides = '';

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if (!empty($image)) {

-                    $sizes = getimagesize(trim($image));

-                    $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

-                    $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

-

-                    if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

-                    }

-

-                    if (isset($image->src)) {

-                        if ($image->height >= 400) {

-                            $spacer_height = 0;

-                        } else {

-                            $spacer_height = ((400 - $image->height) / 2);

-                        }

-

-                        $image_title = isset($image->title) ? $image->title : '';

-

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                        $slides++;

-                    }

-                }

-            }// endfore

-        } //end if

-    } else {

-        $main_slides = '';

-        $nav_slides = '';

-        /**

-         * Filter if default images should show on the details page.

-         *

-         * @param bool $use_default_image Default false.

-         * @since 1.6.16

-         */

-        $use_default_image = apply_filters('geodir_details_default_image_show', false);

-        $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image->height >= 400) {

-                    $spacer_height = 0;

-                } else {

-                    $spacer_height = ((400 - $image->height) / 2);

-                }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                $slides++;

-            }

-        }// endfore

-    }

+		$preview_post_images = array();

+		if ($preview_get_images) {

+			foreach ($preview_get_images as $row) {

+				$preview_post_images[] = $row->src;

+			}

+		}

+		if (!empty($preview_post_images)) {

+			$post->post_images = implode(',', $preview_post_images);

+		}

+	}

+

+	if ($preview) {

+		$post_images = array();

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

+			$post_images = explode(",", $post->post_images);

+		}

+

+		$main_slides = '';

+		$nav_slides = '';

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if (!empty($image)) {

+					$sizes = getimagesize(trim($image));

+					$width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

+					$height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

+

+					if ($image && $width && $height) {

+						$image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+					}

+

+					if (isset($image->src)) {

+						if ($image->height >= 400) {

+							$spacer_height = 0;

+						} else {

+							$spacer_height = ((400 - $image->height) / 2);

+						}

+

+						$image_title = isset($image->title) ? $image->title : '';

+

+						$main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

+						$main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

+						$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+						$slides++;

+					}

+				}

+			}// endfore

+		} //end if

+	} else {

+		$main_slides = '';

+		$nav_slides = '';

+		/**

+		 * Filter if default images should show on the details page.

+		 *

+		 * @param bool $use_default_image Default false.

+		 * @since 1.6.16

+		 */

+		$use_default_image = apply_filters('geodir_details_default_image_show', false);

+		$post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image->height >= 400) {

+					$spacer_height = 0;

+				} else {

+					$spacer_height = ((400 - $image->height) / 2);

+				}

+				$caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+				$main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

+				$main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+				$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+				$slides++;

+			}

+		}// endfore

+	}

 

-    if (!empty($post_images)) {

-        ?>

+	if (!empty($post_images)) {

+		?>

         <div class="geodir_flex-container">

             <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div>

             <div id="geodir_slider" class="geodir_flexslider ">

@@ -1083,7 +1083,7 @@ 
             <?php } ?>

         </div>

     <?php

-    }

+	}

 }

 

 add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);

@@ -1098,177 +1098,177 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+	global $preview, $post;?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

-    $taxonomies = array();

-

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-

-    if ($preview && !$is_backend_preview) {

-        $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

-        $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

-    } else {

-        $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

-    }

+	$taxonomies = array();

+

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+

+	if ($preview && !$is_backend_preview) {

+		$post_type = $post->listing_type;

+		$post_taxonomy = $post_type . 'category';

+		$post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

+	} else {

+		$post_type = $post->post_type;

+		$post_taxonomy = $post_type . 'category';

+	}

 //{	

-    $post_type_info = get_post_type_object($post_type);

-    $listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

-

-    if (!empty($post->post_tags)) {

-

-        if (taxonomy_exists($post_type . '_tags')):

-            $links = array();

-            $terms = array();

-            // to limit post tags

-            $post_tags = trim($post->post_tags, ",");

-            $post_id = isset($post->ID) ? $post->ID : '';

-            /**

-             * Filter the post tags.

-             *

-             * Allows you to filter the post tags output on the details page of a post.

-             *

-             * @since 1.0.0

-             * @param string $post_tags A comma seperated list of tags.

-             * @param int $post_id The current post id.

-             */

-            $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

-

-            $post->post_tags = $post_tags;

-            $post_tags = explode(",", trim($post->post_tags, ","));

-

-

-            foreach ($post_tags as $post_term) {

-

-                // fix slug creation order for tags & location

-                $post_term = trim($post_term);

-

-                $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

-                } else {

-                    $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

-                    $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

-                    $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

-                    $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

-                    $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

-                    $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

-                    if ($match_country || $match_region || $match_city) {

-                        $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    }

-                }

-

-                if (!is_wp_error($term) && is_object($term)) {

-

-                    // fix tag link on detail page

-                    if ($priority_location) {

-

-                        $tag_link = "<a href=''>$post_term</a>";

-                        /**

-                         * Filter the tag name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $tag_link The tag link html.

-                         * @param object $term The tag term object.

-                         */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

-                        /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    }

-                    $terms[] = $term;

-                }

-                //

-            }

-            if (!isset($listing_label)) {

-                $listing_label = '';

-            }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

-        endif;

-

-    }

-

-    if (!empty($post->{$post_taxonomy})) {

-        $links = array();

-        $terms = array();

-        $termsOrdered = array();

-        if (!is_array($post->{$post_taxonomy})) {

-            $post_term = explode(",", trim($post->{$post_taxonomy}, ","));

-        } else {

-            $post_term = $post->{$post_taxonomy};

+	$post_type_info = get_post_type_object($post_type);

+	$listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

+

+	if (!empty($post->post_tags)) {

+

+		if (taxonomy_exists($post_type . '_tags')):

+			$links = array();

+			$terms = array();

+			// to limit post tags

+			$post_tags = trim($post->post_tags, ",");

+			$post_id = isset($post->ID) ? $post->ID : '';

+			/**

+			 * Filter the post tags.

+			 *

+			 * Allows you to filter the post tags output on the details page of a post.

+			 *

+			 * @since 1.0.0

+			 * @param string $post_tags A comma seperated list of tags.

+			 * @param int $post_id The current post id.

+			 */

+			$post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

+

+			$post->post_tags = $post_tags;

+			$post_tags = explode(",", trim($post->post_tags, ","));

+

+

+			foreach ($post_tags as $post_term) {

+

+				// fix slug creation order for tags & location

+				$post_term = trim($post_term);

+

+				$priority_location = false;

+				if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

+					$term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+				} else {

+					$post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

+					$post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

+					$post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

+					$match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

+					$match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

+					$match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

+					if ($match_country || $match_region || $match_city) {

+						$priority_location = true;

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					} else {

+						$insert_term = wp_insert_term($post_term, $post_type . '_tags');

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					}

+				}

+

+				if (!is_wp_error($term) && is_object($term)) {

+

+					// fix tag link on detail page

+					if ($priority_location) {

+

+						$tag_link = "<a href=''>$post_term</a>";

+						/**

+						 * Filter the tag name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $tag_link The tag link html.

+						 * @param object $term The tag term object.

+						 */

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					} else {

+						$tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

+						/** This action is documented in geodirectory-template_actions.php */

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					}

+					$terms[] = $term;

+				}

+				//

+			}

+			if (!isset($listing_label)) {

+				$listing_label = '';

+			}

+			$taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+		endif;

+

+	}

+

+	if (!empty($post->{$post_taxonomy})) {

+		$links = array();

+		$terms = array();

+		$termsOrdered = array();

+		if (!is_array($post->{$post_taxonomy})) {

+			$post_term = explode(",", trim($post->{$post_taxonomy}, ","));

+		} else {

+			$post_term = $post->{$post_taxonomy};

 			

 			if ($preview && !$is_backend_preview) {

 				$post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

 			}

-        }

-

-        $post_term = array_unique($post_term);

-        if (!empty($post_term)) {

-            foreach ($post_term as $post_term) {

-                $post_term = trim($post_term);

-

-                if ($post_term != ''):

-                    $term = get_term_by('id', $post_term, $post_taxonomy);

-

-                    if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

-                        /**

-                         * Filter the category name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $term_link The link html to the category.

-                         * @param object $term The category term object.

-                         */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

-                        $links[] = $term_link;

-                        $terms[] = $term;

-                    }

-                endif;

-            }

-            // order alphabetically

-            asort($links);

-            foreach (array_keys($links) as $key) {

-                $termsOrdered[$key] = $terms[$key];

-            }

-            $terms = $termsOrdered;

+		}

+

+		$post_term = array_unique($post_term);

+		if (!empty($post_term)) {

+			foreach ($post_term as $post_term) {

+				$post_term = trim($post_term);

+

+				if ($post_term != ''):

+					$term = get_term_by('id', $post_term, $post_taxonomy);

+

+					if (is_object($term)) {

+						$term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+						/**

+						 * Filter the category name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $term_link The link html to the category.

+						 * @param object $term The category term object.

+						 */

+						$term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+						$links[] = $term_link;

+						$terms[] = $term;

+					}

+				endif;

+			}

+			// order alphabetically

+			asort($links);

+			foreach (array_keys($links) as $key) {

+				$termsOrdered[$key] = $terms[$key];

+			}

+			$terms = $termsOrdered;

 

-        }

+		}

 

-        if (!isset($listing_label)) {

-            $listing_label = '';

-        }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+		if (!isset($listing_label)) {

+			$listing_label = '';

+		}

+		$taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

 

-    }

+	}

 

-    /**

-     * Filter the taxonomies array before output.

-     *

-     * @since 1.5.9

-     * @param array $taxonomies The array of cats and tags.

-     * @param string $post_type The post type being output.

-     * @param string $listing_label The post type label.

-     * @param string $listing_label The post type label with ucwords function.

-     */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+	/**

+	 * Filter the taxonomies array before output.

+	 *

+	 * @since 1.5.9

+	 * @param array $taxonomies The array of cats and tags.

+	 * @param string $post_type The post type being output.

+	 * @param string $listing_label The post type label.

+	 * @param string $listing_label The post type label with ucwords function.

+	 */

+	$taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

 

-    if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

-    }

+	if (isset($taxonomies[$post_taxonomy])) {

+		echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+	}

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+	if (isset($taxonomies[$post_type . '_tags']))

+		echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

 

-    ?>

+	?>

     </p><?php

 }

 

@@ -1290,140 +1290,140 @@ 
 function geodir_action_details_micordata($post='')

 {

 

-    global $preview;

-    if(empty($post)){global $post;}

-    if ($preview || !geodir_is_page('detail')) {

-        return;

-    }

-

-    // url

-    $c_url = geodir_curPageURL();

-

-    // post reviews

-    $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

-    if (empty($post_reviews)) {

-        $reviews = '';

-    } else {

-        foreach ($post_reviews as $review) {

-            $reviews[] = array(

-                "@type" => "Review",

-                "author" => $review->comment_author,

-                "datePublished" => $review->comment_date,

-                "description" => $review->comment_content,

-                "reviewRating" => array(

-                    "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

-                    "ratingValue" => geodir_get_commentoverall($review->comment_ID),

-                    "worstRating" => "1"

-                )

-            );

-        }

-

-    }

-

-    // post images

-    $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

-    if (empty($post_images)) {

-        $images = '';

-    } else {

-        $i_arr = array();

-        foreach ($post_images as $img) {

-            $i_arr[] = $img->src;

-        }

-

-        if (count($i_arr) == 1) {

-            $images = $i_arr[0];

-        } else {

-            $images = $i_arr;

-        }

-

-    }

-    //print_r($post);

-    // external links

-    $external_links =  array();

-    $external_links[] = $post->geodir_website;

-    $external_links[] = $post->geodir_twitter;

-    $external_links[] = $post->geodir_facebook;

-    $external_links = array_filter($external_links);

-

-    if(!empty($external_links)){

-        $external_links = array_values($external_links);

-    }

-

-    // reviews

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    // schema type

-    $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

-        $cat_schema = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

-    }

-

-    $schema = array();

-    $schema['@context'] = "https://schema.org";

-    $schema['@type'] = $schema_type;

-    $schema['name'] = $post->post_title;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

-    $schema['telephone'] = $post->geodir_contact;

-    $schema['url'] = $c_url;

-    $schema['sameAs'] = $external_links;

-    $schema['image'] = $images;

-    $schema['address'] = array(

-        "@type" => "PostalAddress",

-        "streetAddress" => $post->post_address,

-        "addressLocality" => $post->post_city,

-        "addressRegion" => $post->post_region,

-        "addressCountry" => $post->post_country,

-        "postalCode" => $post->post_zip

-    );

-

-    if($post->post_latitude && $post->post_longitude) {

-        $schema['geo'] = array(

-            "@type" => "GeoCoordinates",

-            "latitude" => $post->post_latitude,

-            "longitude" => $post->post_longitude

-        );

-    }

-

-    if($post_avgratings) {

-        $schema['aggregateRating'] = array(

-            "@type" => "AggregateRating",

-            "ratingValue" => $post_avgratings,

-            "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

-            "worstRating" => "1",

-            "ratingCount" => $comment_count

-        );

-    }

-    $schema['review'] = $reviews;

-

-    /**

-     * Allow the schema JSON-LD info to be filtered.

-     *

-     * @since 1.5.4

-     * @since 1.5.7 Added $post variable.

-     * @param array $schema The array of schema data to be filtered.

-     * @param object $post The post object.

-     */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

-

-

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

-

-

-    $uploads = wp_upload_dir();

-    $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

-

-    /**

-     * Show facebook open graph meta info

-     *

-     * @since 1.6.6

-     * @param string $facebook_og The open graph html to be filtered.

-     * @param object $post The post object.

-     */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+	global $preview;

+	if(empty($post)){global $post;}

+	if ($preview || !geodir_is_page('detail')) {

+		return;

+	}

+

+	// url

+	$c_url = geodir_curPageURL();

+

+	// post reviews

+	$post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

+	if (empty($post_reviews)) {

+		$reviews = '';

+	} else {

+		foreach ($post_reviews as $review) {

+			$reviews[] = array(

+				"@type" => "Review",

+				"author" => $review->comment_author,

+				"datePublished" => $review->comment_date,

+				"description" => $review->comment_content,

+				"reviewRating" => array(

+					"@type" => "Rating",

+					"bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+					"ratingValue" => geodir_get_commentoverall($review->comment_ID),

+					"worstRating" => "1"

+				)

+			);

+		}

+

+	}

+

+	// post images

+	$post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if (empty($post_images)) {

+		$images = '';

+	} else {

+		$i_arr = array();

+		foreach ($post_images as $img) {

+			$i_arr[] = $img->src;

+		}

+

+		if (count($i_arr) == 1) {

+			$images = $i_arr[0];

+		} else {

+			$images = $i_arr;

+		}

+

+	}

+	//print_r($post);

+	// external links

+	$external_links =  array();

+	$external_links[] = $post->geodir_website;

+	$external_links[] = $post->geodir_twitter;

+	$external_links[] = $post->geodir_facebook;

+	$external_links = array_filter($external_links);

+

+	if(!empty($external_links)){

+		$external_links = array_values($external_links);

+	}

+

+	// reviews

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	// schema type

+	$schema_type = 'LocalBusiness';

+	if(isset($post->default_category) && $post->default_category){

+		$cat_schema = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

+		if($cat_schema){$schema_type = $cat_schema;}

+		if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+	}

+

+	$schema = array();

+	$schema['@context'] = "https://schema.org";

+	$schema['@type'] = $schema_type;

+	$schema['name'] = $post->post_title;

+	$schema['description'] = wp_strip_all_tags( $post->post_content, true );

+	$schema['telephone'] = $post->geodir_contact;

+	$schema['url'] = $c_url;

+	$schema['sameAs'] = $external_links;

+	$schema['image'] = $images;

+	$schema['address'] = array(

+		"@type" => "PostalAddress",

+		"streetAddress" => $post->post_address,

+		"addressLocality" => $post->post_city,

+		"addressRegion" => $post->post_region,

+		"addressCountry" => $post->post_country,

+		"postalCode" => $post->post_zip

+	);

+

+	if($post->post_latitude && $post->post_longitude) {

+		$schema['geo'] = array(

+			"@type" => "GeoCoordinates",

+			"latitude" => $post->post_latitude,

+			"longitude" => $post->post_longitude

+		);

+	}

+

+	if($post_avgratings) {

+		$schema['aggregateRating'] = array(

+			"@type" => "AggregateRating",

+			"ratingValue" => $post_avgratings,

+			"bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

+			"worstRating" => "1",

+			"ratingCount" => $comment_count

+		);

+	}

+	$schema['review'] = $reviews;

+

+	/**

+	 * Allow the schema JSON-LD info to be filtered.

+	 *

+	 * @since 1.5.4

+	 * @since 1.5.7 Added $post variable.

+	 * @param array $schema The array of schema data to be filtered.

+	 * @param object $post The post object.

+	 */

+	$schema = apply_filters('geodir_details_schema', $schema,$post);

+

+

+	echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+

+

+	$uploads = wp_upload_dir();

+	$facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

+

+	/**

+	 * Show facebook open graph meta info

+	 *

+	 * @since 1.6.6

+	 * @param string $facebook_og The open graph html to be filtered.

+	 * @param object $post The post object.

+	 */

+	echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

 

 

 

@@ -1443,7 +1443,7 @@ 
  */

 function geodir_action_details_next_prev()

 {

-    ?>

+	?>

     <div class="geodir-pos_navigation clearfix">

     <div

         class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

@@ -1461,15 +1461,15 @@ 
  */

 function geodir_action_before_single_post()

 {

-    global $post;

-    /**

-     * Called at the very start of the details page output, before the title section.

-     *

-     * @since 1.0.0

-     * @param object $post The current post object.

-     * @global WP_Post|null $post The current post, if available.

-     */

-    do_action('geodir_before_single_post', $post); // extra action	

+	global $post;

+	/**

+	 * Called at the very start of the details page output, before the title section.

+	 *

+	 * @since 1.0.0

+	 * @param object $post The current post object.

+	 * @global WP_Post|null $post The current post, if available.

+	 */

+	do_action('geodir_before_single_post', $post); // extra action	

 }

 

 /**

@@ -1480,13 +1480,13 @@ 
  */

 function geodir_action_after_single_post($post)

 {

-    /**

-     * Called on the details page after the details page tabs section and before the next/prev buttons.

-     *

-     * @since 1.0.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_after_single_post', $post); // extra action	

+	/**

+	 * Called on the details page after the details page tabs section and before the next/prev buttons.

+	 *

+	 * @since 1.0.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_after_single_post', $post); // extra action	

 }

 

 add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);

@@ -1512,168 +1512,168 @@ 
  */

 function geodir_action_listings_title()

 {

-    global $wp, $term;

-

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

-

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

-

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

-    $single_name = $post_type_info->labels->singular_name;

-

-    $taxonomy = geodir_get_taxonomies($gd_post_type, true);

-

-    $gd_country = get_query_var('gd_country');

-    $gd_region = get_query_var('gd_region');

-    $gd_city = get_query_var('gd_city');

-

-    if (!empty($term)) {

-        $location_name = '';

-        if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

-            if ($gd_country != '') {

-                $location_name = geodir_sanitize_location_name('gd_country', $gd_country);

-            }

-

-            if ($gd_region != '') {

-                $location_name = geodir_sanitize_location_name('gd_region', $gd_region);

-            }

-

-            if ($gd_city != '') {

-                $location_name = geodir_sanitize_location_name('gd_city', $gd_city);

-            }

-        }

-

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term)) {

-            $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                $location_last_char = substr($location_name, -1);

-                $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-            } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-            }

-        } else {

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

-                $current_term = get_term_by('slug', $term, $taxonomy[1]);

-

-                if (!empty($current_term)) {

-                    $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                        $location_last_char = substr($location_name, -1);

-                        $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-                    } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-                    }

-                }

-            }

-        }

+	global $wp, $term;

 

-    } else {

-        $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

-        $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

-        $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-        $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-        if (function_exists('get_actual_location_name')) {

-            $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-            $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-            $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-        }

+	$list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+	$single_name = $post_type_info->labels->singular_name;

 

-        if ($gd_city != '') {

-            if ($gd_city_actual != '') {

-                $gd_city = $gd_city_actual;

-            } else {

-                $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);

-                $gd_city = preg_replace('/[_-]/', ' ', $gd_city);

-                $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-            }

+	$taxonomy = geodir_get_taxonomies($gd_post_type, true);

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

-        } else if ($gd_region != '') {

-            if ($gd_region_actual != '') {

-                $gd_region = $gd_region_actual;

-            } else {

-                $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);

-                $gd_region = preg_replace('/[_-]/', ' ', $gd_region);

-                $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-            }

+	$gd_country = get_query_var('gd_country');

+	$gd_region = get_query_var('gd_region');

+	$gd_city = get_query_var('gd_city');

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

-        } else if ($gd_country != '') {

-            if ($gd_country_actual != '') {

-                $gd_country = $gd_country_actual;

-            } else {

-                $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);

-                $gd_country = preg_replace('/[_-]/', ' ', $gd_country);

-                $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

-        }

-    }

-

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-

-    $title = $list_title;

-    $gd_page = '';

-    if(geodir_is_page('pt')){

-        $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

-        global $wp_query;

-        $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

-            $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

-        }

+	if (!empty($term)) {

+		$location_name = '';

+		if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

+			if ($gd_country != '') {

+				$location_name = geodir_sanitize_location_name('gd_country', $gd_country);

+			}

 

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

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

-            $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

-        }

+			if ($gd_region != '') {

+				$location_name = geodir_sanitize_location_name('gd_region', $gd_region);

+			}

 

-    }

+			if ($gd_city != '') {

+				$location_name = geodir_sanitize_location_name('gd_city', $gd_city);

+			}

+		}

+

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term)) {

+			$current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

+			if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+				$location_last_char = substr($location_name, -1);

+				$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+				$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+			} else {

+				$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+			}

+		} else {

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

+				$current_term = get_term_by('slug', $term, $taxonomy[1]);

+

+				if (!empty($current_term)) {

+					$current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

+					if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+						$location_last_char = substr($location_name, -1);

+						$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+						$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+					} else {

+						$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+					}

+				}

+			}

+		}

+

+	} else {

+		$gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+

+		$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+

+		if (function_exists('get_actual_location_name')) {

+			$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+			$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+			$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+		}

+

+		if ($gd_city != '') {

+			if ($gd_city_actual != '') {

+				$gd_city = $gd_city_actual;

+			} else {

+				$gd_city = preg_replace('/-(\d+)$/', '', $gd_city);

+				$gd_city = preg_replace('/[_-]/', ' ', $gd_city);

+				$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+			}

 

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+		} else if ($gd_region != '') {

+			if ($gd_region_actual != '') {

+				$gd_region = $gd_region_actual;

+			} else {

+				$gd_region = preg_replace('/-(\d+)$/', '', $gd_region);

+				$gd_region = preg_replace('/[_-]/', ' ', $gd_region);

+				$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+			}

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+		} else if ($gd_country != '') {

+			if ($gd_country_actual != '') {

+				$gd_country = $gd_country_actual;

+			} else {

+				$gd_country = preg_replace('/-(\d+)$/', '', $gd_country);

+				$gd_country = preg_replace('/[_-]/', ' ', $gd_country);

+				$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+			}

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the listing page title.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the category page.

-         */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+		}

+	}

+

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+

+	$title = $list_title;

+	$gd_page = '';

+	if(geodir_is_page('pt')){

+		$gd_page = 'pt';

+		$title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

+		global $wp_query;

+		$current_term = $wp_query->get_queried_object();

+		if (strpos($current_term->taxonomy,'_tags') !== false) {

+			$title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

+		}

+

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

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

+			$title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

+		}

+

+	}

+

+

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the listing page title.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the category page.

+		 */

+		apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1686,46 +1686,46 @@ 
  */

 function geodir_action_listings_description()

 {

-    global $wp_query;

-    $current_term = $wp_query->get_queried_object();

+	global $wp_query;

+	$current_term = $wp_query->get_queried_object();

 

-    $gd_post_type = geodir_get_current_posttype();

-    if (isset($current_term->term_id) && $current_term->term_id != '') {

+	$gd_post_type = geodir_get_current_posttype();

+	if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

-        $saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

-        if ($term_desc && !$saved_data) {

-            $saved_data = $term_desc;

-        }

+		$term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+		$saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

+		if ($term_desc && !$saved_data) {

+			$saved_data = $term_desc;

+		}

 

-        // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		// stop payment manager filtering content length

+		$filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

+		if ( false !== $filter_priority ) {

+			remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        /**

-         * Apply the core filter `the_content` filter to the variable string.

-         *

-         * This is a WordPress core filter that does many things.

-         *

-         * @since 1.0.0

-         * @param string $var The string to apply the filter to.

-         */

-        $cat_description = apply_filters('the_content', $saved_data);

+		/**

+		 * Apply the core filter `the_content` filter to the variable string.

+		 *

+		 * This is a WordPress core filter that does many things.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to apply the filter to.

+		 */

+		$cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		if ( false !== $filter_priority ) {

+			add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        if ($cat_description) {

-            ?>

+		if ($cat_description) {

+			?>

 

             <div class="term_description"><?php echo $cat_description;?></div> <?php

-        }

+		}

 

-    }

+	}

 }

 

 // action for adding the listings page top widget area

@@ -1744,11 +1744,11 @@ 
  */

 function geodir_action_geodir_sidebar_listings_top()

 {

-    if (get_option('geodir_show_listing_top_section')) { ?>

+	if (get_option('geodir_show_listing_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

             <?php dynamic_sidebar('geodir_listing_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -1771,35 +1771,35 @@ 
  */

 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_open_replace'])) {

-        $text = $tc['geodir_sidebar_left_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_left_open_id'])) {

-        $id = $tc['geodir_sidebar_left_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_left_open_class'])) {

-        $class = $tc['geodir_sidebar_left_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_open_replace'])) {

+		$text = $tc['geodir_sidebar_left_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_left_open_id'])) {

+		$id = $tc['geodir_sidebar_left_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_left_open_class'])) {

+		$class = $tc['geodir_sidebar_left_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1815,13 +1815,13 @@ 
  */

 function geodir_action_sidebar_left_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_close_replace'])) {

-        $text = $tc['geodir_sidebar_left_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_close_replace'])) {

+		$text = $tc['geodir_sidebar_left_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1834,7 +1834,7 @@ 
  */

 function geodir_listing_left_section()

 {

-    if (get_option('geodir_show_listing_left_section')) { ?>

+	if (get_option('geodir_show_listing_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -1852,20 +1852,20 @@ 
  */

 function geodir_action_listings_sidebar_left()

 {

-    if (get_option('geodir_show_listing_left_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) left sidebar content.

-         *

-         * All the content for the listings page left sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_left_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) left sidebar content.

+		 *

+		 * All the content for the listings page left sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'listings-page');

+	}

 }

 

 /**

@@ -1878,7 +1878,7 @@ 
  */

 function geodir_listing_right_section()

 {

-    if (get_option('geodir_show_listing_right_section')) { ?>

+	if (get_option('geodir_show_listing_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -1896,20 +1896,20 @@ 
  */

 function geodir_action_listings_sidebar_right()

 {

-    if (get_option('geodir_show_listing_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) right sidebar content.

-         *

-         * All the content for the listings page right sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) right sidebar content.

+		 *

+		 * All the content for the listings page right sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'listings-page');

+	}

 }

 

 

@@ -1926,23 +1926,23 @@ 
  */

 function geodir_action_main_content_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_open_replace'])) {

-        $text = $tc['geodir_main_content_open_replace'];

-    } else {

-        $text = '<main id="[id]" class="[class]" role="main">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_open_replace'])) {

+		$text = $tc['geodir_main_content_open_replace'];

+	} else {

+		$text = '<main id="[id]" class="[class]" role="main">';

+	}

 

-    if (!empty($tc['geodir_main_content_open_id'])) {

-        $id = $tc['geodir_main_content_open_id'];

-    }

-    if (!empty($tc['geodir_main_content_open_class'])) {

-        $class = $tc['geodir_main_content_open_class'];

-    }

+	if (!empty($tc['geodir_main_content_open_id'])) {

+		$id = $tc['geodir_main_content_open_id'];

+	}

+	if (!empty($tc['geodir_main_content_open_class'])) {

+		$class = $tc['geodir_main_content_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1955,13 +1955,13 @@ 
  */

 function geodir_action_main_content_close()

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_close_replace'])) {

-        $text = $tc['geodir_main_content_close_replace'];

-    } else {

-        $text = '</main><!-- main ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_close_replace'])) {

+		$text = $tc['geodir_main_content_close_replace'];

+	} else {

+		$text = '</main><!-- main ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1973,14 +1973,14 @@ 
  */

 function geodir_action_listings_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_listing_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_listing_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);

@@ -1996,47 +1996,47 @@ 
  */

 function geodir_action_listings_content()

 {

-    /**

-     * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @param string $id The id for the div. Usually 'geodir-main-content'.

-     * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @see 'geodir_main_content_close' Where the oposing closing tag is added.

-     */

-    do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

-    $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

-    /**

-     * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_listing');

-    echo '</div>';

-

-    /**

-     * This actions calls the listings list content. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_listings_content_inside');

-

-    /**

-     * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_listing');

-

-    /**

-     * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @see 'geodir_main_content_open' Where the oposing opening tag is added.

-     */

-    do_action('geodir_main_content_close', 'listings-page');

+	/**

+	 * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @param string $id The id for the div. Usually 'geodir-main-content'.

+	 * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @see 'geodir_main_content_close' Where the oposing closing tag is added.

+	 */

+	do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

+	$extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

+	echo '<div class="clearfix '.$extra_class.'">';

+	/**

+	 * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_listing');

+	echo '</div>';

+

+	/**

+	 * This actions calls the listings list content. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_listings_content_inside');

+

+	/**

+	 * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_listing');

+

+	/**

+	 * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_main_content_open' Where the oposing opening tag is added.

+	 */

+	do_action('geodir_main_content_close', 'listings-page');

 }

 

 

@@ -2051,10 +2051,10 @@ 
  */

 function geodir_action_sidebar_listings_bottom_section()

 {

-    if (get_option('geodir_show_listing_bottom_section')) { ?>

+	if (get_option('geodir_show_listing_bottom_section')) { ?>

         <div class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

             <?php dynamic_sidebar('geodir_listing_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2074,38 +2074,38 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-    $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

-

-    if(geodir_is_page('add-listing')){

-        $gd_page = 'add-listing';

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

-            $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

-            $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

-        }

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

+		$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+	$title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

+

+	if(geodir_is_page('add-listing')){

+		$gd_page = 'add-listing';

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

+			$title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

+		}elseif(isset($listing_type)){

+			$title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

-    echo $title;

-    echo '</h1></header>';

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+	echo $title;

+	echo '</h1></header>';

 }

 

 add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);

@@ -2136,61 +2136,61 @@ 
  */

 function geodir_action_add_listing_form()

 {

-    global $cat_display, $post_cat, $current_user, $gd_session;

-    $page_id = get_the_ID();

-    $post = '';

-    $title = '';

-    $desc = '';

-    $kw_tags = '';

-    $required_msg = '';

-    $submit_button = '';

-

-    $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

-

-    $thumb_img_arr = array();

-    $curImages = '';

-

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

-        global $post;

-        $post = (object)$gd_session->get('listing');

-        $listing_type = $post->listing_type;

-        $title = $post->post_title;

-        $desc = $post->post_desc;

-        $post_cat = $post->post_category;

-

-        $kw_tags = $post->post_tags;

-        $curImages = isset($post->post_images) ? $post->post_images : '';

-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-        global $post, $post_images;

-

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

-        $thumb_img_arr = geodir_get_images($post->ID);

-        if ($thumb_img_arr) {

-            foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

-            }

-        }

+	global $cat_display, $post_cat, $current_user, $gd_session;

+	$page_id = get_the_ID();

+	$post = '';

+	$title = '';

+	$desc = '';

+	$kw_tags = '';

+	$required_msg = '';

+	$submit_button = '';

+

+	$ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

+

+	$thumb_img_arr = array();

+	$curImages = '';

+

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

+		global $post;

+		$post = (object)$gd_session->get('listing');

+		$listing_type = $post->listing_type;

+		$title = $post->post_title;

+		$desc = $post->post_desc;

+		$post_cat = $post->post_category;

+

+		$kw_tags = $post->post_tags;

+		$curImages = isset($post->post_images) ? $post->post_images : '';

+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+		global $post, $post_images;

+

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

+		$thumb_img_arr = geodir_get_images($post->ID);

+		if ($thumb_img_arr) {

+			foreach ($thumb_img_arr as $post_img) {

+				$curImages .= $post_img->src . ',';

+			}

+		}

 

-        $listing_type = $post->post_type;

-        $title = $post->post_title;

-        $desc = $post->post_content;

-        $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

-    } else {

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-    }

+		$listing_type = $post->post_type;

+		$title = $post->post_title;

+		$desc = $post->post_content;

+		$kw_tags = $post->post_tags;

+		$kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+	} else {

+		$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+	}

 

-    if ($current_user->ID != '0') {

-        $user_login = true;

-    }

+	if ($current_user->ID != '0') {

+		$user_login = true;

+	}

 

-    $post_type_info = geodir_get_posttype_info($listing_type);

+	$post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+	$cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

     

-    $package_info = array();

-    $package_info = geodir_post_package_info($package_info, $post);

-    ?>

+	$package_info = array();

+	$package_info = geodir_post_package_info($package_info, $post);

+	?>

     <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

         <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

         <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

@@ -2201,114 +2201,114 @@ 
         <?php } if (isset($_REQUEST['backandedit'])) { ?>

             <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

         <?php

-        } 

-        /**

-         * Called at the very top of the add listing page form for frontend.

-         *

-         * This is called just before the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_detail_fields');

-        ?>

+		} 

+		/**

+		 * Called at the very top of the add listing page form for frontend.

+		 *

+		 * This is called just before the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_detail_fields');

+		?>

         <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

         <?php

-        /**

-         * Called at the top of the add listing page form for frontend.

-         *

-         * This is called after the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_main_form_fields');

-        ?>

+		/**

+		 * Called at the top of the add listing page form for frontend.

+		 *

+		 * This is called after the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_main_form_fields');

+		?>

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

             <label><?php

-                /**

-                 * Filter the add listing page title input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+				/**

+				 * Filter the add listing page title input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

             <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

-        $show_editor = get_option('geodir_tiny_editor_on_add_listing');

-        $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

-        /**

-         * Filter whether to show or don't show the editor.

-         *

-         * @since 1.6.16

-         * @param bool $show_editor If true the editor will be available for description field.

-         * @param object $package_info The listing package.

-         * @param string $listing_type The current post type.

-         * @param object $post The current post object.

-         */

-        $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

-

-        $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

-        $desc_limit = '';

-        /**

-         * Filter the add listing description field character limit number.

-         *

-         * @since 1.0.0

-         * @param int $desc_limit The amount of characters to limit the description to.

-         */

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

-        /**

-         * Filter the add listing description field text.

-         *

-         * @since 1.0.0

-         * @param string $desc The text for the description field.

-         * @param int $desc_limit The character limit number if any.

-         */

-        $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

-        $desc_limit_msg = '';

-        /**

-         * Filter the add listing description limit message.

-         *

-         * This is the message shown if there is a limit applied to the amount of characters the description can use.

-         *

-         * @since 1.0.0

-         * @param string $desc_limit_msg The limit message string if any.

-         * @param int $desc_limit The character limit numer if any.

-         */

-        $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

+		$show_editor = get_option('geodir_tiny_editor_on_add_listing');

+		$show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

+		/**

+		 * Filter whether to show or don't show the editor.

+		 *

+		 * @since 1.6.16

+		 * @param bool $show_editor If true the editor will be available for description field.

+		 * @param object $package_info The listing package.

+		 * @param string $listing_type The current post type.

+		 * @param object $post The current post object.

+		 */

+		$show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

+

+		$desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

+		$desc_limit = '';

+		/**

+		 * Filter the add listing description field character limit number.

+		 *

+		 * @since 1.0.0

+		 * @param int $desc_limit The amount of characters to limit the description to.

+		 */

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

+		/**

+		 * Filter the add listing description field text.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc The text for the description field.

+		 * @param int $desc_limit The character limit number if any.

+		 */

+		$desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

+		$desc_limit_msg = '';

+		/**

+		 * Filter the add listing description limit message.

+		 *

+		 * This is the message shown if there is a limit applied to the amount of characters the description can use.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc_limit_msg The limit message string if any.

+		 * @param int $desc_limit The character limit numer if any.

+		 */

+		$desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

-        $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_description_field');

+		$desc_class = '';

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_description_field');

             

-            $desc_class = ' required_field';

-        } else {

-            $desc_class = ' hidden';

-        }

-        ?>

+			$desc_class = ' required_field';

+		} else {

+			$desc_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

             <label><?php

-                /**

-                 * Filter the add listing page description input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+				/**

+				 * Filter the add listing page description input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

-            if ($show_editor) {

-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

-            ?>

+			if ($show_editor) {

+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+			?>

                 <div class="editor" field_id="post_desc" field_type="editor">

                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

@@ -2322,56 +2322,56 @@ 
             <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_description_field');

-        }

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_description_field');

+		}

         

-        $kw_tags = esc_attr(stripslashes($kw_tags));

-        $kw_tags_count = TAGKW_TEXT_COUNT;

-        $kw_tags_msg = TAGKW_MSG;

-        /**

-         * Filter the add listing tags character limit.

-         *

-         * @since 1.0.0

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

-        /**

-         * Filter the add listing tags field value.

-         *

-         * You can use the $_REQUEST values to check if this is a go back and edit value etc.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags The tag field value, usually a comma separated list of tags.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

-        /**

-         * Filter the add listing tags field message text.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags_msg The message shown under the field.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

+		$kw_tags = esc_attr(stripslashes($kw_tags));

+		$kw_tags_count = TAGKW_TEXT_COUNT;

+		$kw_tags_msg = TAGKW_MSG;

+		/**

+		 * Filter the add listing tags character limit.

+		 *

+		 * @since 1.0.0

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

+		/**

+		 * Filter the add listing tags field value.

+		 *

+		 * You can use the $_REQUEST values to check if this is a go back and edit value etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags The tag field value, usually a comma separated list of tags.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

+		/**

+		 * Filter the add listing tags field message text.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags_msg The message shown under the field.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

-        $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_listing_tags_field');

-        } else {

-            $tags_class = ' hidden';

-        }

-        ?>

+		$tags_class = '';

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_listing_tags_field');

+		} else {

+			$tags_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

@@ -2379,90 +2379,90 @@ 
             <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_listing_tags_field');

-        }

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_listing_tags_field');

+		}

         

-        $package_info = array();

-        $package_info = geodir_post_package_info($package_info, $post);

+		$package_info = array();

+		$package_info = geodir_post_package_info($package_info, $post);

         

-        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

+		geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

         

-        // adjust values here

-        $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+		// adjust values here

+		$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-        $multiple = true; // allow multiple files upload

+		$multiple = true; // allow multiple files upload

 

-        $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+		$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-        $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+		$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-        $thumb_img_arr = array();

-        $totImg = 0;

-        if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+		$thumb_img_arr = array();

+		$totImg = 0;

+		if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

+			$post = (object)$gd_session->get('listing');

+			if (isset($post->post_images))

+				$curImages = trim($post->post_images, ",");

 

 

-            if ($curImages != '') {

-                $curImages_array = explode(',', $curImages);

-                $totImg = count($curImages_array);

-            }

+			if ($curImages != '') {

+				$curImages_array = explode(',', $curImages);

+				$totImg = count($curImages_array);

+			}

 

-            $listing_type = $post->listing_type;

+			$listing_type = $post->listing_type;

 

-        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

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

-            $listing_type = $post->post_type;

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

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

+			$listing_type = $post->post_type;

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

-        } else {

-            $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-        }

+		} else {

+			$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+		}

 

 

-        if (!empty($thumb_img_arr)) {

-            foreach ($thumb_img_arr as $img) {

-                //$curImages = $img->src.",";

-            }

-

-            $totImg = count((array)$thumb_img_arr);

-        }

+		if (!empty($thumb_img_arr)) {

+			foreach ($thumb_img_arr as $img) {

+				//$curImages = $img->src.",";

+			}

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

-

-        $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

-        $show_image_input_box = ($image_limit != '0');

-        /**

-         * Filter to be able to show/hide the image upload section of the add listing form.

-         *

-         * @since 1.0.0

-         * @param bool $show_image_input_box Set true to show. Set false to not show.

-         * @param string $listing_type The custom post type slug.

-         */

-        $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

-        if ($show_image_input_box) {

-            ?>

+			$totImg = count((array)$thumb_img_arr);

+		}

+

+		if ($curImages != '')

+			$svalue = $curImages; // this will be initial value of the above form field. Image urls.

+		else

+			$svalue = '';

+

+		$image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

+		$show_image_input_box = ($image_limit != '0');

+		/**

+		 * Filter to be able to show/hide the image upload section of the add listing form.

+		 *

+		 * @since 1.0.0

+		 * @param bool $show_image_input_box Set true to show. Set false to not show.

+		 * @param string $listing_type The custom post type slug.

+		 */

+		$show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

+		if ($show_image_input_box) {

+			?>

 

             <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

                 <?php if ($image_limit == 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+				} ?>

             </h5>

 

             <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox"

@@ -2500,12 +2500,12 @@ 
         <?php } ?>

 

         <?php

-        /**

-         * Called on the add listing page form for frontend just after the image upload field.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_main_form_fields');?>

+		/**

+		 * Called on the add listing page form for frontend just after the image upload field.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_main_form_fields');?>

 

 

         <!-- add captcha code -->

@@ -2534,7 +2534,7 @@ 
 

     </form>

     <?php

-    wp_reset_query();

+	wp_reset_query();

 }

 

 /**

@@ -2545,7 +2545,7 @@ 
  */

 function geodir_add_listing_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_add_listing_sidebar');

+	dynamic_sidebar('geodir_add_listing_sidebar');

 }

 

 add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);

@@ -2560,16 +2560,16 @@ 
  */

 function geodir_action_add_listing_sidebar()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

-    /**

-     * This is used to add the content to the add listing page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_add_listing_sidebar_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_sidebar_right_close', 'details-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

+	/**

+	 * This is used to add the content to the add listing page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_add_listing_sidebar_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_sidebar_right_close', 'details-page');

 }

 

 ###############################################

@@ -2586,11 +2586,11 @@ 
  */

 function geodir_action_geodir_sidebar_signup_top()

 {

-    ?>

+	?>

     <div

         class="<?php

-        /** This action is documented in geodirectory_template_actions.php */

-        echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

+		/** This action is documented in geodirectory_template_actions.php */

+		echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

         <?php dynamic_sidebar('Reg/Login Top Section');?>

     </div><!-- clearfix ends here-->

 <?php

@@ -2609,11 +2609,11 @@ 
 function geodir_action_signup_forms()

 {

 

-    global $user_login;

+	global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+	$is_enable_signup = get_option( 'users_can_register' );

     

-    ?>

+	?>

     <script type="text/javascript">

         <?php if ( $user_login ) { ?>

         setTimeout(function () {

@@ -2649,67 +2649,67 @@ 
         <?php } ?>

     </script><?php

 

-    global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

-

-    if (!empty($errors)) {

-        foreach ($errors as $errorsObj) {

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

-                for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

-                    $registration_error_msg = 1;

-                }

-            }

-        }

-    }

+	global $errors;

+	if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

+		$errors->add('claim_login', LOGIN_CLAIM);

+

+	if (!empty($errors)) {

+		foreach ($errors as $errorsObj) {

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

+				for ($i = 0; $i < count($val); $i++) {

+					echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+					$registration_error_msg = 1;

+				}

+			}

+		}

+	}

 

-    if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

-        ?>

+	if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

+		?>

 

         <div class="login_form">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

 

     <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

 

         <div class="registration_form">

             <?php

-            /**

-             * Contains registration form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+			/**

+			 * Contains registration form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

 

         <div class="login_form_l">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

         

         <?php if ( $is_enable_signup ) { ?>

             <div class="registration_form_r">

                 <?php

-                /**

-                 * Contains registration form template.

-                 *

-                 * @since 1.0.0

-                 */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+				/**

+				 * Contains registration form template.

+				 *

+				 * @since 1.0.0

+				 */

+				include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2741,66 +2741,66 @@ 
  */

 function geodir_action_author_page_title()

 {

-    global $term;

+	global $term;

 

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

-    $single_name = $post_type_info->labels->singular_name;

+	$list_title = $add_string_in_title . $post_type_info->labels->name;

+	$single_name = $post_type_info->labels->singular_name;

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type);

+	$taxonomy = geodir_get_taxonomies($gd_post_type);

 

-    if (!empty($term)) {

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

-    }

+	if (!empty($term)) {

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term))

+			$list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+	}

 

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

-    $title = $list_title;

-    if(geodir_is_page('author')){

-        $gd_page = 'author';

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

-            $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

-        }

+	$title = $list_title;

+	if(geodir_is_page('author')){

+		$gd_page = 'author';

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

+			$title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the author page title text.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the page.

-         */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the author page title text.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the page.

+		 */

+		apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

 }

 

 

@@ -2818,11 +2818,11 @@ 
  */

 function geodir_action_geodir_sidebar_author_top()

 {

-    if (get_option('geodir_show_author_top_section')) { ?>

+	if (get_option('geodir_show_author_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

             <?php dynamic_sidebar('geodir_author_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2838,7 +2838,7 @@ 
  */

 function geodir_author_left_section()

 {

-    if (get_option('geodir_show_author_left_section')) { ?>

+	if (get_option('geodir_show_author_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -2859,19 +2859,19 @@ 
  */

 function geodir_action_author_sidebar_left()

 {

-    if (get_option('geodir_show_author_left_section')) {

+	if (get_option('geodir_show_author_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'author-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'author-page');

+	}

 }

 

 /**

@@ -2884,7 +2884,7 @@ 
  */

 function geodir_author_right_section()

 {

-    if (get_option('geodir_show_author_right_section')) { ?>

+	if (get_option('geodir_show_author_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -2904,18 +2904,18 @@ 
  */

 function geodir_action_author_sidebar_right()

 {

-    if (get_option('geodir_show_author_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'author-page');

-    }

+	if (get_option('geodir_show_author_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'author-page');

+	}

 }

 

 /**

@@ -2927,14 +2927,14 @@ 
  */

 function geodir_action_author_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_author_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_author_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);

@@ -2949,22 +2949,22 @@ 
  */

 function geodir_action_author_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

-    echo '<div class="clearfix">';

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the author page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_author_content_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_after_listing');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'author-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

+	echo '<div class="clearfix">';

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the author page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_author_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'author-page');

 }

 

 add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);

@@ -2978,11 +2978,11 @@ 
  */

 function geodir_action_sidebar_author_bottom_section()

 {

-    if (get_option('geodir_show_author_bottom_section')) { ?>

+	if (get_option('geodir_show_author_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

             <?php dynamic_sidebar('geodir_author_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3001,23 +3001,23 @@ 
  */

 function geodir_action_search_page_title()

 {

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+	$pt_name = '';

+	if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/** This action is documented in geodirectory_template_actions.php */

+		apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3033,11 +3033,11 @@ 
  */

 function geodir_action_geodir_sidebar_search_top()

 {

-    if (get_option('geodir_show_search_top_section')) { ?>

+	if (get_option('geodir_show_search_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

             <?php dynamic_sidebar('geodir_search_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3053,7 +3053,7 @@ 
  */

 function geodir_search_left_section()

 {

-    if (get_option('geodir_show_search_left_section')) { ?>

+	if (get_option('geodir_show_search_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -3073,19 +3073,19 @@ 
  */

 function geodir_action_search_sidebar_left()

 {

-    if (get_option('geodir_show_search_left_section')) {

+	if (get_option('geodir_show_search_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'search-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'search-page');

+	}

 }

 

 /**

@@ -3098,7 +3098,7 @@ 
  */

 function geodir_search_right_section()

 {

-    if (get_option('geodir_show_search_right_section')) { ?>

+	if (get_option('geodir_show_search_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -3118,18 +3118,18 @@ 
  */

 function geodir_action_search_sidebar_right()

 {

-    if (get_option('geodir_show_search_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'search-page');

-    }

+	if (get_option('geodir_show_search_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'search-page');

+	}

 }

 

 

@@ -3144,11 +3144,11 @@ 
  */

 function geodir_action_sidebar_search_bottom_section()

 {

-    if (get_option('geodir_show_search_bottom_section')) { ?>

+	if (get_option('geodir_show_search_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

             <?php dynamic_sidebar('geodir_search_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3163,14 +3163,14 @@ 
  */

 function geodir_action_search_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_search_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_search_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);

@@ -3186,22 +3186,22 @@ 
  */

 function geodir_action_search_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

-    echo '<div class="clearfix">';

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the search page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_search_content_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_after_listing');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'search-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

+	echo '<div class="clearfix">';

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the search page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_search_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'search-page');

 }

 

 ###############################################

@@ -3224,11 +3224,11 @@ 
  */

 function geodir_action_geodir_sidebar_home_top()

 {

-    if (get_option('geodir_show_home_top_section')) { ?>

+	if (get_option('geodir_show_home_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

             <?php dynamic_sidebar('geodir_home_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3244,7 +3244,7 @@ 
  */

 function geodir_home_left_section()

 {

-    if (get_option('geodir_show_home_left_section')) { ?>

+	if (get_option('geodir_show_home_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_left'); ?>

         </div><!-- end geodir-content-left -->

@@ -3266,19 +3266,19 @@ 
  */

 function geodir_action_home_sidebar_left()

 {

-    if (get_option('geodir_show_home_left_section')) {

+	if (get_option('geodir_show_home_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'home-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'home-page');

+	}

 }

 

 /**

@@ -3291,7 +3291,7 @@ 
  */

 function geodir_home_right_section()

 {

-    if (get_option('geodir_show_home_right_section')) { ?>

+	if (get_option('geodir_show_home_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_right'); ?>

         </div><!-- end geodir-content-right -->

@@ -3312,18 +3312,18 @@ 
  */

 function geodir_action_home_sidebar_right()

 {

-    if (get_option('geodir_show_home_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'home-page');

-    }

+	if (get_option('geodir_show_home_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'home-page');

+	}

 }

 

 /**

@@ -3334,7 +3334,7 @@ 
  */

 function geodir_action_home_content_inside()

 {

-    dynamic_sidebar('geodir_home_content');

+	dynamic_sidebar('geodir_home_content');

 }

 

 add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);

@@ -3349,28 +3349,28 @@ 
  */

 function geodir_action_home_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

-    /**

-     * This called before the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_home_content');

-    /**

-     * This is used to add the content to the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_home_content_inside');

-    /**

-     * This is called after the homepage main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_home_content');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'home-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

+	/**

+	 * This called before the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_home_content');

+	/**

+	 * This is used to add the content to the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_home_content_inside');

+	/**

+	 * This is called after the homepage main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_home_content');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'home-page');

 }

 

 add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);

@@ -3385,11 +3385,11 @@ 
  */

 function geodir_action_sidebar_home_bottom_section()

 {

-    if (get_option('geodir_show_home_bottom_section')) { ?>

+	if (get_option('geodir_show_home_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

             <?php dynamic_sidebar('geodir_home_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3417,13 +3417,13 @@ 
  */

 function geodir_filter_listing_page_title($list_title)

 {

-    if (is_search() && trim(get_search_query()) == '') {

-        $gd_post_type = geodir_get_current_posttype();

-        $post_type_info = get_post_type_object($gd_post_type);

+	if (is_search() && trim(get_search_query()) == '') {

+		$gd_post_type = geodir_get_current_posttype();

+		$post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

-    }

-    return $list_title;

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+	}

+	return $list_title;

 }

 

 add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');

@@ -3438,62 +3438,62 @@ 
  * @param string $gd_page The geodirectory page type. Default null.

  */

 function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

-    global $post;

-

-    $gd_page_id = NULL;

-    if ($gd_page == 'home-page' && geodir_is_page('home')) {

-        $gd_page_id = geodir_home_page_id();

-    } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

-        $gd_page_id = geodir_preview_page_id();

-    } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

-        $gd_page_id = geodir_add_listing_page_id();

-    } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

-        $gd_page_id = geodir_success_page_id();

-    } else if ($gd_page == 'location-page' && geodir_is_page('location')) {

-        $gd_page_id = geodir_location_page_id();

-    } else if ($gd_page == 'info-page' && geodir_is_page('info')) {

-        $gd_page_id = geodir_info_page_id();

-    } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

-        $gd_page_id = geodir_login_page_id();

-    } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

-        $gd_page_id = geodir_payment_checkout_page_id();

-    } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

-        $gd_page_id = geodir_payment_invoices_page_id();

-    }

-

-    if (!$gd_page_id > 0) {

-        return;

-    }

+	global $post;

+

+	$gd_page_id = NULL;

+	if ($gd_page == 'home-page' && geodir_is_page('home')) {

+		$gd_page_id = geodir_home_page_id();

+	} else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

+		$gd_page_id = geodir_preview_page_id();

+	} else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

+		$gd_page_id = geodir_add_listing_page_id();

+	} else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

+		$gd_page_id = geodir_success_page_id();

+	} else if ($gd_page == 'location-page' && geodir_is_page('location')) {

+		$gd_page_id = geodir_location_page_id();

+	} else if ($gd_page == 'info-page' && geodir_is_page('info')) {

+		$gd_page_id = geodir_info_page_id();

+	} else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

+		$gd_page_id = geodir_login_page_id();

+	} else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

+		$gd_page_id = geodir_payment_checkout_page_id();

+	} else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

+		$gd_page_id = geodir_payment_invoices_page_id();

+	}

+

+	if (!$gd_page_id > 0) {

+		return;

+	}

     

-    $display = 'before';

-    /**

-     * Filter the position to display the page content.

-     *

-     * @since 1.6.3

-     *

-     * @param string $display Position to add the post content.

-     * @param string $gd_page The geodirectory page type.

-     */

-    $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

-

-    if ($position !== $display) {

-        return;

-    }

-

-    $gd_post = $post;

+	$display = 'before';

+	/**

+	 * Filter the position to display the page content.

+	 *

+	 * @since 1.6.3

+	 *

+	 * @param string $display Position to add the post content.

+	 * @param string $gd_page The geodirectory page type.

+	 */

+	$display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

+

+	if ($position !== $display) {

+		return;

+	}

+

+	$gd_post = $post;

     

-    setup_postdata(get_post($gd_page_id));

+	setup_postdata(get_post($gd_page_id));

 

-    if (get_the_content()) {

-        ?>

+	if (get_the_content()) {

+		?>

         <section class="entry-content clearfix" itemprop="articleBody"><?php the_content(); ?></section>

         <?php

-    }

+	}

 

-    $post = $gd_post;

-    if (!empty($gd_post) && is_object($gd_post)) {

-        setup_postdata($gd_post);

-    }

+	$post = $gd_post;

+	if (!empty($gd_post) && is_object($gd_post)) {

+		setup_postdata($gd_post);

+	}

 

 }

 add_action('geodir_add_page_content', 'geodir_add_page_content', 10, 2);

@@ -3514,13 +3514,13 @@ 
  * @return string Filtered SQL JOIN clause.

  */

 function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $plugin_prefix;

+	global $plugin_prefix;

 

-    if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

-    }

+	if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+		$join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+	}

     

-    return $join;

+	return $join;

 }

 add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

 add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

@@ -3542,31 +3542,31 @@ 
  * @return string Filtered SQL WHERE clause.

  */

 function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $post_locations = '';

-        $post_locations_var = array();

+	if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+		$post_locations = '';

+		$post_locations_var = array();

         

-        if ( !empty( $post->country_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

-        }

-

-        if ( !empty( $post->region_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

-        }

-

-        if ( !empty( $post->city_slug ) ) {

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

-        }

+		if ( !empty( $post->country_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->country_slug . "]";

+		}

+

+		if ( !empty( $post->region_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->region_slug . "],%";

+		}

+

+		if ( !empty( $post->city_slug ) ) {

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "[" . $post->city_slug . "],%";

+		}

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

-    }

+		$where .= $wpdb->prepare( $post_locations, $post_locations_var );

+	}

     

-    return $where;

+	return $where;

 }

 add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

 add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file

Spacing +183 added lines, -183 removed lines

@@ -283,7 +283,7 @@ 
 

     //php

     if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+        include_once('geodirectory-functions/compatibility/'.$tc['geodir_theme_compat_code'].'.php');

     }

 

     //geodir_full_page_class

@@ -453,13 +453,13 @@ 
 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -573,13 +573,13 @@ 
 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -677,7 +677,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -736,10 +736,10 @@ 
 

     $json = '{';

     $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

+    $json .= '"t": "'.$json_title.'",';

+    $json .= '"lt": "'.$post_latitude.'",';

+    $json .= '"ln": "'.$post_longitude.'",';

+    $json .= '"i":"'.$term_icon.'"';

     $json .= '}';

 

     $post->marker_json = $json;

@@ -966,7 +966,7 @@ 
      * @param string $class The class to use. Default is 'entry-header'.

      */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.stripslashes(get_the_title()).'</h1></header>';

 }

 

 

@@ -1020,7 +1020,7 @@ 
                     $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1032,9 +1032,9 @@ 
 

                         $image_title = isset($image->title) ? $image->title : '';

 

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                        $main_slides .= '<li><img src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:'.$spacer_height.'px;margin:0 auto;" />';

+                        $main_slides .= '<img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:400px;margin:0 auto;" /></li>';

+                        $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:48px;margin:0 auto;" /></li>';

                         $slides++;

                     }

                 }

@@ -1060,10 +1060,10 @@ 
                 } else {

                     $spacer_height = ((400 - $image->height) / 2);

                 }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $main_slides .= '<li><img src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:'.$spacer_height.'px;margin:0 auto;" />';

+                $main_slides .= '<img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

         }// endfore

@@ -1098,7 +1098,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1107,11 +1107,11 @@ 
 

     if ($preview && !$is_backend_preview) {

         $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

         $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

     } else {

         $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

     }

 //{	

     $post_type_info = get_post_type_object($post_type);

@@ -1119,7 +1119,7 @@ 
 

     if (!empty($post->post_tags)) {

 

-        if (taxonomy_exists($post_type . '_tags')):

+        if (taxonomy_exists($post_type.'_tags')):

             $links = array();

             $terms = array();

             // to limit post tags

@@ -1146,8 +1146,8 @@ 
                 $post_term = trim($post_term);

 

                 $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+                if ($insert_term = term_exists($post_term, $post_type.'_tags')) {

+                    $term = get_term_by('id', $insert_term['term_id'], $post_type.'_tags');

                 } else {

                     $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

                     $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

@@ -1157,10 +1157,10 @@ 
                     $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

                     if ($match_country || $match_region || $match_city) {

                         $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $insert_term = wp_insert_term($post_term, $post_type.'_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     }

                 }

 

@@ -1177,12 +1177,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

+                        $tag_link = "<a href='".esc_attr(get_term_link($term->term_id, $term->taxonomy))."'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1192,7 +1192,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+            $taxonomies[$post_type.'_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

         endif;

 

     }

@@ -1220,7 +1220,7 @@ 
                     $term = get_term_by('id', $post_term, $post_taxonomy);

 

                     if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+                        $term_link = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>$term->name</a>";

                         /**

                          * Filter the category name on the details page.

                          *

@@ -1228,7 +1228,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1246,7 +1246,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

 

     }

 

@@ -1259,14 +1259,14 @@ 
      * @param string $listing_label The post type label.

      * @param string $listing_label The post type label with ucwords function.

      */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+    $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));

 

     if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+        echo '<span class="geodir-category">'.$taxonomies[$post_taxonomy].'</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type.'_tags']))

+        echo '<span class="geodir-tags">'.$taxonomies[$post_type.'_tags'].'</span>';

 

     ?>

     </p><?php

@@ -1287,11 +1287,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

@@ -1312,7 +1312,7 @@ 
                 "description" => $review->comment_content,

                 "reviewRating" => array(

                     "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                    "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                     "ratingValue" => geodir_get_commentoverall($review->comment_ID),

                     "worstRating" => "1"

                 )

@@ -1340,13 +1340,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1356,17 +1356,17 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

+    if (isset($post->default_category) && $post->default_category) {

         $cat_schema = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if ($cat_schema) {$schema_type = $cat_schema; }

+        if (!$schema_type && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "https://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_title;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1380,7 +1380,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1388,7 +1388,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1407,10 +1407,10 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+    echo '<script type="application/ld+json">'.json_encode($schema).'</script>';

 

 

     $uploads = wp_upload_dir();

@@ -1423,7 +1423,7 @@ 
      * @param string $facebook_og The open graph html to be filtered.

      * @param object $post The post object.

      */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+    echo apply_filters('geodir_details_facebook_og', $facebook_og, $post);

 

 

 

@@ -1446,9 +1446,9 @@ 
     ?>

     <div class="geodir-pos_navigation clearfix">

     <div

-        class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

+        class="geodir-post_left"><?php previous_post_link('%link', ''.__('Previous', 'geodirectory'), false) ?></div>

     <div

-        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory') . '', false) ?></div>

+        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory').'', false) ?></div>

     </div><?php

 }

 

@@ -1517,12 +1517,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+    $list_title = $add_string_in_title.__($post_type_info->labels->name, 'geodirectory');

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type, true);

@@ -1550,12 +1550,12 @@ 
         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term)) {

             $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                 $location_last_char = substr($location_name, -1);

                 $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

             } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

             }

         } else {

             if (count($taxonomy) > 1) {

@@ -1563,12 +1563,12 @@ 
 

                 if (!empty($current_term)) {

                     $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                         $location_last_char = substr($location_name, -1);

                         $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                        $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

                     } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                        $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

                     }

                 }

             }

@@ -1596,7 +1596,7 @@ 
                 $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_city."'";

         } else if ($gd_region != '') {

             if ($gd_region_actual != '') {

                 $gd_region = $gd_region_actual;

@@ -1606,7 +1606,7 @@ 
                 $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_region."'";

         } else if ($gd_country != '') {

             if ($gd_country_actual != '') {

                 $gd_country = $gd_country_actual;

@@ -1616,12 +1616,12 @@ 
                 $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_country."'";

         }

     }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

     }

     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

@@ -1631,26 +1631,26 @@ 
 

     $title = $list_title;

     $gd_page = '';

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+        $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1664,16 +1664,16 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the listing page title.

          *

          * @since 1.0.0

          * @param string $list_title The title for the category page.

          */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', $title).'</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1692,16 +1692,16 @@ 
     $gd_post_type = geodir_get_current_posttype();

     if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+        $term_desc = term_description($current_term->term_id, $gd_post_type.'_tags');

         $saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

         if ($term_desc && !$saved_data) {

             $saved_data = $term_desc;

         }

 

         // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        $filter_priority = has_filter('the_content', 'geodir_payments_the_content');

+        if (false !== $filter_priority) {

+            remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         /**

@@ -1715,14 +1715,14 @@ 
         $cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        if (false !== $filter_priority) {

+            add_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1772,13 +1772,13 @@ 
 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -2083,11 +2083,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

-    if(geodir_is_page('add-listing')){

+    if (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

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

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2101,9 +2101,9 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">';

     echo $title;

     echo '</h1></header>';

 }

@@ -2117,7 +2117,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2152,7 +2152,7 @@ 
 

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

         global $post;

-        $post = (object)$gd_session->get('listing');

+        $post = (object) $gd_session->get('listing');

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2167,7 +2167,7 @@ 
         $thumb_img_arr = geodir_get_images($post->ID);

         if ($thumb_img_arr) {

             foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

+                $curImages .= $post_img->src.',';

             }

         }

 

@@ -2175,7 +2175,7 @@ 
         $title = $post->post_title;

         $desc = $post->post_content;

         $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type.'_tags', array('fields' => 'names')));

     } else {

         $listing_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -2186,20 +2186,20 @@ 
 

     $post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing', 'geodirectory');

     

     $package_info = array();

     $package_info = geodir_post_package_info($package_info, $post);

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>" method="post" enctype="multipart/form-data">

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?>

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

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

         <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

-            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/>

+            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/>

         <?php } if (isset($_REQUEST['backandedit'])) { ?>

-            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

+            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/>

         <?php

         } 

         /**

@@ -2211,7 +2211,7 @@ 
          */

         do_action('geodir_before_detail_fields');

         ?>

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

         <?php

         /**

          * Called at the top of the add listing page form for frontend.

@@ -2232,10 +2232,10 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+                echo apply_filters('geodir_add_listing_title_label', sprintf(__('%s Title', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         $show_editor = get_option('geodir_tiny_editor_on_add_listing');

@@ -2281,7 +2281,7 @@ 
         $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

         $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just before the description field.

              *

@@ -2294,7 +2294,7 @@ 
             $desc_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

+        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>">

             <label><?php

                 /**

                  * Filter the add listing page description input label.

@@ -2304,7 +2304,7 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+                echo apply_filters('geodir_add_listing_description_label', sprintf(__('%s Description', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

             if ($show_editor) {

                 $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

@@ -2313,16 +2313,16 @@ 
                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

-                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea>

             <?php } if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just after the description field.

              *

@@ -2361,7 +2361,7 @@ 
         $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

         $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just before the tags field.

              *

@@ -2372,14 +2372,14 @@ 
             $tags_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

+        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just after the tags field.

              *

@@ -2405,7 +2405,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2418,7 +2418,7 @@ 
             $listing_type = $post->listing_type;

 

         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

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

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

             $listing_type = $post->post_type;

             $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

@@ -2432,7 +2432,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2453,15 +2453,15 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($image_limit == 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

                 } ?>

             </h5>

 

@@ -2476,11 +2476,11 @@ 
                 <div

                     class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                     id="<?php echo $id; ?>plupload-upload-ui">

-                    <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

-                          id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+                          id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

                     <?php if ($width && $height): ?>

                         <span class="plupload-resize"></span>

                         <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2493,7 +2493,7 @@ 
                      id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

                 </div>

                 <span

-                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

                 <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

             </div>

 

@@ -2505,7 +2505,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2516,7 +2516,7 @@ 
         </script>

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2526,10 +2526,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2591,7 +2591,7 @@ 
         class="<?php

         /** This action is documented in geodirectory_template_actions.php */

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2611,11 +2611,11 @@ 
 

     global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+    $is_enable_signup = get_option('users_can_register');

     

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2632,7 +2632,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2657,7 +2657,7 @@ 
         foreach ($errors as $errorsObj) {

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

                 for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+                    echo "<div class=error_msg_fix>".$val[$i].'</div>';

                     $registration_error_msg = 1;

                 }

             }

@@ -2674,10 +2674,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

 

-    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

+    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup) { ?>

 

         <div class="registration_form">

             <?php

@@ -2686,7 +2686,7 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

@@ -2698,10 +2698,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

         

-        <?php if ( $is_enable_signup ) { ?>

+        <?php if ($is_enable_signup) { ?>

             <div class="registration_form_r">

                 <?php

                 /**

@@ -2709,7 +2709,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+                include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2746,12 +2746,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

+    $list_title = $add_string_in_title.$post_type_info->labels->name;

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type);

@@ -2759,12 +2759,12 @@ 
     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+            $list_title .= __(' in', 'geodirectory')." '".geodir_ucwords($current_term->name)."'";

     }

 

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($post_type_info->labels->name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** This action is documented in geodirectory_template_actions.php */

@@ -2773,11 +2773,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2791,16 +2791,16 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the author page title text.

          *

          * @since 1.0.0

          * @param string $list_title The title for the page.

          */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+        apply_filters('geodir_author_page_title_text', $title).'</h1></header>';

 }

 

 

@@ -3005,19 +3005,19 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($pt_name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', wptexturize($list_title)).'</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3421,7 +3421,7 @@ 
         $gd_post_type = geodir_get_current_posttype();

         $post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' :', 'geodirectory');

     }

     return $list_title;

 }

@@ -3437,7 +3437,7 @@ 
  * @param string $position Position to add the post content. 'before' or 'after'. Default 'before'.

  * @param string $gd_page The geodirectory page type. Default null.

  */

-function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

+function geodir_add_page_content($position = 'before', $gd_page = '') {

     global $post;

 

     $gd_page_id = NULL;

@@ -3513,17 +3513,17 @@ 
  * @param WP_Post $post           WP_Post object.

  * @return string Filtered SQL JOIN clause.

  */

-function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_join($join, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $plugin_prefix;

 

-    if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+    if (!empty($post->post_type) && in_array($post->post_type, geodir_get_posttypes())) {

+        $join .= " INNER JOIN ".$plugin_prefix.$post->post_type."_detail AS gd ON gd.post_id = p.ID";

     }

     

     return $join;

 }

-add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

-add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

+add_filter('get_previous_post_join', 'geodir_previous_next_post_join', 10, 5);

+add_filter('get_next_post_join', 'geodir_previous_next_post_join', 10, 5);

 

 /**

  * Filters the WHERE clause in the SQL for an adjacent post query.

@@ -3541,32 +3541,32 @@ 
  * @param WP_Post $post          WP_Post object.

  * @return string Filtered SQL WHERE clause.

  */

-function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_where($where, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+    if (!empty($post->post_type) && (!empty($post->country_slug) || !empty($post->region_slug) || !empty($post->city_slug)) && in_array($post->post_type, geodir_get_posttypes())) {

         $post_locations = '';

         $post_locations_var = array();

         

-        if ( !empty( $post->country_slug ) ) {

+        if (!empty($post->country_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

+            $post_locations_var[] = "%,[".$post->country_slug."]";

         }

 

-        if ( !empty( $post->region_slug ) ) {

+        if (!empty($post->region_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

+            $post_locations_var[] = "%,[".$post->region_slug."],%";

         }

 

-        if ( !empty( $post->city_slug ) ) {

+        if (!empty($post->city_slug)) {

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

+            $post_locations_var[] = "[".$post->city_slug."],%";

         }

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

+        $where .= $wpdb->prepare($post_locations, $post_locations_var);

     }

     

     return $where;

 }

-add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

-add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file
+add_filter('get_previous_post_where', 'geodir_previous_next_post_where', 10, 5);

+add_filter('get_next_post_where', 'geodir_previous_next_post_where', 10, 5);
\ No newline at end of file

geodirectory-functions/custom_fields_output_functions.php

Braces +25 added lines, -38 removed lines

@@ -22,8 +22,7 @@ 
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -77,8 +76,10 @@ 
 
             if ( $post->{$html_var} == '1' ):
                 $html_val = __( 'Yes', 'geodirectory' );
-            else:
+            else {
+            	:
                 $html_val = __( 'No', 'geodirectory' );
+            }
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -116,8 +117,7 @@ 
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -197,8 +197,7 @@ 
 function geodir_cf_url($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -313,8 +312,7 @@ 
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -403,8 +401,7 @@ 
 function geodir_cf_time($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -457,9 +454,10 @@ 
         if ($post->{$cf['htmlvar_name']}):
 
             $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+            if ($post->{$cf['htmlvar_name']} != '') {
+                            //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
                 $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+            }
 
             $field_icon = geodir_field_icon_proccess($cf);
             if (strpos($field_icon, 'http') !== false) {
@@ -498,8 +496,7 @@ 
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
     global $preview;
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -566,7 +563,7 @@ 
                 $date_format = str_replace($search, $replace, $date_format);
 
                 $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+            } else{
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
@@ -575,7 +572,7 @@ 
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else{
                 return '';
             }
 
@@ -618,8 +615,7 @@ 
 function geodir_cf_text($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -725,8 +721,7 @@ 
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -833,8 +828,7 @@ 
 function geodir_cf_select($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -935,8 +929,7 @@ 
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1062,8 +1055,7 @@ 
 function geodir_cf_email($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1197,7 +1189,7 @@ 
                      */
                     $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
+                } else{
                     $html .=  $email;
                 }
                 $html .= '</span></div>';
@@ -1225,8 +1217,7 @@ 
 function geodir_cf_file($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1366,8 +1357,7 @@ 
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1457,8 +1447,7 @@ 
 function geodir_cf_html($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1547,8 +1536,7 @@ 
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1670,8 +1658,7 @@ 
 function geodir_cf_address($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);

Indentation +1542 added lines, -1542 removed lines

@@ -21,84 +21,84 @@ 
  */
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
-        /**
-         * Filter the checkbox html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the checkbox html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ( (int) $post->{$html_var} == 1 ):
-
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
-            else:
-                $html_val = __( 'No', 'geodirectory' );
-            endif;
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+		/**
+		 * Filter the checkbox html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the checkbox html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ( (int) $post->{$html_var} == 1 ):
+
+			if ( $post->{$html_var} == '1' ):
+				$html_val = __( 'Yes', 'geodirectory' );
+			else:
+				$html_val = __( 'No', 'geodirectory' );
+			endif;
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
 
@@ -115,71 +115,71 @@ 
  */
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
-        /**
-         * Filter the fieldset html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the fieldset html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $field_set_start;
-        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
-
-        if ($field_set_start == 1) {
-            $html = '';
-        } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
-            //$field_set_start = 1;
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+		/**
+		 * Filter the fieldset html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the fieldset html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $field_set_start;
+		$fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
+
+		if ($field_set_start == 1) {
+			$html = '';
+		} else {
+			$html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+			//$field_set_start = 1;
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
 
@@ -196,106 +196,106 @@ 
  */
 function geodir_cf_url($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
-        /**
-         * Filter the url html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the url html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-
-                if ($cf['name'] == 'geodir_facebook') {
-                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';
-                } elseif ($cf['name'] == 'geodir_twitter') {
-                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';
-                } else {
-                    $field_icon_af = '<i class="fa fa-link"></i>';
-                }
-
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
-
-
-            $website = !empty($a_url['url']) ? $a_url['url'] : '';
-            $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
-            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
-
-
-
-            // all search engines that use the nofollow value exclude links that use it from their ranking calculation
-            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
-            /**
-             * Filter custom field website name.
-             *
-             * @since 1.0.0
-             *
-             * @param string $title Website Title.
-             * @param string $website Website URL.
-             * @param int $post->ID Post ID.
-             */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+		/**
+		 * Filter the url html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the url html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+
+				if ($cf['name'] == 'geodir_facebook') {
+					$field_icon_af = '<i class="fa fa-facebook-square"></i>';
+				} elseif ($cf['name'] == 'geodir_twitter') {
+					$field_icon_af = '<i class="fa fa-twitter-square"></i>';
+				} else {
+					$field_icon_af = '<i class="fa fa-link"></i>';
+				}
+
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
+
+
+			$website = !empty($a_url['url']) ? $a_url['url'] : '';
+			$title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
+			if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+			$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
+
+
+
+			// all search engines that use the nofollow value exclude links that use it from their ranking calculation
+			$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
+			/**
+			 * Filter custom field website name.
+			 *
+			 * @since 1.0.0
+			 *
+			 * @param string $title Website Title.
+			 * @param string $website Website URL.
+			 * @param int $post->ID Post ID.
+			 */
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
 
@@ -312,80 +312,80 @@ 
  */
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
-        /**
-         * Filter the phone html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the phone html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-phone"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+		/**
+		 * Filter the phone html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the phone html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-phone"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
+					$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
 
@@ -402,85 +402,85 @@ 
  */
 function geodir_cf_time($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
-        /**
-         * Filter the time html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the time html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
-                $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-clock-o"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+		/**
+		 * Filter the time html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the time html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$value = '';
+			if ($post->{$cf['htmlvar_name']} != '')
+				//$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+				$value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-clock-o"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
 
@@ -496,111 +496,111 @@ 
  * @return string The html to output for the custom field.
  */
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
-    global $preview;
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
-        /**
-         * Filter the datepicker html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the datepicker html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $date_format = geodir_default_date_format();
-            if ($cf['extra_fields'] != '') {
-                $date_format = stripslashes_deep(unserialize($cf['extra_fields']));
-                $date_format = $date_format['date_format'];
-            }
-            // check if we need to change the format or not
-            $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
-
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
-
-                $date_format = str_replace($search, $replace, $date_format);
-
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
-                $post_htmlvar_value = $post->{$cf['htmlvar_name']};
-            }
-
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
-                $date_format_from = $preview ? $date_format : 'Y-m-d';
-                $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
-                //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
-                //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
-                return '';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-calendar"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	global $preview;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+		/**
+		 * Filter the datepicker html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the datepicker html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$date_format = geodir_default_date_format();
+			if ($cf['extra_fields'] != '') {
+				$date_format = stripslashes_deep(unserialize($cf['extra_fields']));
+				$date_format = $date_format['date_format'];
+			}
+			// check if we need to change the format or not
+			$date_format_len = strlen(str_replace(' ', '', $date_format));
+			if($date_format_len>5){// if greater then 4 then it's the old style format.
+
+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+				$replace = array('d','j','l','m','n','F','Y');//PHP date format
+
+				$date_format = str_replace($search, $replace, $date_format);
+
+				$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+			}else{
+				$post_htmlvar_value = $post->{$cf['htmlvar_name']};
+			}
+
+			if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+				$date_format_from = $preview ? $date_format : 'Y-m-d';
+				$value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
+				//$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
+				//$value = date_i18n($date_format, strtotime($post_htmlvar_value));
+			}else{
+				return '';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-calendar"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
 
@@ -617,97 +617,97 @@ 
  */
 function geodir_cf_text($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
-        /**
-         * Filter the text html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the text html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+		/**
+		 * Filter the text html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the text html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
 
     
 
-    // If not html then we run the standard output.
-    if(empty($html)){
+	// If not html then we run the standard output.
+	if(empty($html)){
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-            $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+			$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
 
-            $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
-                $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
-                }
-            }
+			$value = $post->{$cf['htmlvar_name']};
+			if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+				$extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
+				if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
+					if(!ceil($value) > 0){return '';}// dont output blank prices
+					$value = geodir_currency_format_number($value,$cf);
+				}
+			}
 
 
-            $html .= $value;
-            $html .= '</div>';
+			$html .= $value;
+			$html .= '</div>';
 
-        endif;
+		endif;
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
 
@@ -724,98 +724,98 @@ 
  */
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
-        /**
-         * Filter the radio html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the radio html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
-
-            if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
-                $html_val = __('No', 'geodirectory');
-            } else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
-                $html_val = __('Yes', 'geodirectory');
-            } else {
-                if (!empty($cf['option_values'])) {
-                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                    if (!empty($cf_option_values)) {
-                        foreach ($cf_option_values as $cf_option_value) {
-                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                                $html_val = $cf_option_value['label'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+		/**
+		 * Filter the radio html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the radio html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		$html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
+
+			if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
+				$html_val = __('No', 'geodirectory');
+			} else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
+				$html_val = __('Yes', 'geodirectory');
+			} else {
+				if (!empty($cf['option_values'])) {
+					$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+					if (!empty($cf_option_values)) {
+						foreach ($cf_option_values as $cf_option_value) {
+							if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+								$html_val = $cf_option_value['label'];
+							}
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
 
@@ -833,92 +833,92 @@ 
  */
 function geodir_cf_select($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
-        /**
-         * Filter the select html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the select html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-            $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
-
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                            $field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+		/**
+		 * Filter the select html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the select html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+			$field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
+
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+							$field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $field_value . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
 
@@ -935,117 +935,117 @@ 
  */
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
-        /**
-         * Filter the multiselect html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the multiselect html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            if (is_array($post->{$cf['htmlvar_name']})) {
-                $post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
-
-            if(is_array($field_values)){
-                $field_values = array_map('trim', $field_values);
-            }
-
-            $option_values = array();
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
-                            $option_values[] = $cf_option_value['label'];
-                        }
-                    }
-                }
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
-
-            if (count($option_values) > 1) {
-                $html .= '<ul>';
-
-                foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
-                }
-
-                $html .= '</ul>';
-            } else {
-                $html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
-            }
-
-            $html .= '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+		/**
+		 * Filter the multiselect html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the multiselect html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			if (is_array($post->{$cf['htmlvar_name']})) {
+				$post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
+
+			if(is_array($field_values)){
+				$field_values = array_map('trim', $field_values);
+			}
+
+			$option_values = array();
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
+							$option_values[] = $cf_option_value['label'];
+						}
+					}
+				}
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
+
+			if (count($option_values) > 1) {
+				$html .= '<ul>';
+
+				foreach ($option_values as $val) {
+					$html .= '<li>' . $val . '</li>';
+				}
+
+				$html .= '</ul>';
+			} else {
+				$html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1062,155 +1062,155 @@ 
  */
 function geodir_cf_email($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
-        /**
-         * Filter the email html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the email html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
-            return ''; // Remove Send Enquiry | Send To Friend from listings page
-        }
-
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
-
-        if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
-            global $send_to_friend;
-            $send_to_friend = true;
-            $b_send_inquiry = '';
-            $b_sendtofriend = '';
-
-            $html = '';
-            if (!$preview) {
-                $b_send_inquiry = 'b_send_inquiry';
-                $b_sendtofriend = 'b_sendtofriend';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-envelope"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-            $seperator = '';
-            if ($post->{$cf['htmlvar_name']}) {
-                $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-                $seperator = ' | ';
-            }
-
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
-                $html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
-            }
-
-            $html .= '</span></div>';
-
-
-            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
-            }
-
-            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
-
-        } else {
-
-            if ($post->{$cf['htmlvar_name']}) {
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '<i class="fa fa-envelope"></i>';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span><span class="geodir-email-address-output">';
-                $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
-                    /**
-                     * Filter email custom field name output.
-                     *
-                     * @since 1.5.3
-                     *
-                     * @param string $email The email string being output.
-                     * @param array $cf Custom field variables array.
-                     */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
-                }
-                $html .= '</span></div>';
-            }
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+		/**
+		 * Filter the email html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the email html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
+			return ''; // Remove Send Enquiry | Send To Friend from listings page
+		}
+
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+
+		if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
+			global $send_to_friend;
+			$send_to_friend = true;
+			$b_send_inquiry = '';
+			$b_sendtofriend = '';
+
+			$html = '';
+			if (!$preview) {
+				$b_send_inquiry = 'b_send_inquiry';
+				$b_sendtofriend = 'b_sendtofriend';
+				$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-envelope"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+			$seperator = '';
+			if ($post->{$cf['htmlvar_name']}) {
+				$b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
+				$html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+				$seperator = ' | ';
+			}
+
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
+				$b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
+				$html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+			}
+
+			$html .= '</span></div>';
+
+
+			if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
+				$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+			}
+
+			/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
+
+		} else {
+
+			if ($post->{$cf['htmlvar_name']}) {
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '<i class="fa fa-envelope"></i>';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span><span class="geodir-email-address-output">';
+				$email = $post->{$cf['htmlvar_name']} ;
+				if($e_split = explode('@',$email)){
+					/**
+					 * Filter email custom field name output.
+					 *
+					 * @since 1.5.3
+					 *
+					 * @param string $email The email string being output.
+					 * @param array $cf Custom field variables array.
+					 */
+					$email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
+					$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+				}else{
+					$html .=  $email;
+				}
+				$html .= '</span></div>';
+			}
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
 
@@ -1227,130 +1227,130 @@ 
  */
 function geodir_cf_file($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
-        /**
-         * Filter the file html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the file html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            $files = explode(",", $post->{$cf['htmlvar_name']});
-            if (!empty($files)):
-
-                $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
-
-                $file_paths = '';
-                foreach ($files as $file) {
-                    if (!empty($file)) {
-
-                        // $filetype = wp_check_filetype($file);
-
-                        $image_name_arr = explode('/', $file);
-                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
-                        $filename = end($image_name_arr);
-                        $img_name_arr = explode('.', $filename);
-
-                        $arr_file_type = wp_check_filetype($filename);
-                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
-                            continue;
-                        }
-
-                        $uploaded_file_type = $arr_file_type['type'];
-                        $uploaded_file_ext = $arr_file_type['ext'];
-
-                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
-                            continue; // Invalid file type.
-                        }
-
-                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
-                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
-
-                        // If the uploaded file is image
-                        if (in_array($uploaded_file_type, $image_file_types)) {
-                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
-                            $file_paths .= '<a href="'.$file.'">';
-                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
-                            $file_paths .= '</a>';
-                            //$file_paths .= '<img src="'.$file.'"  />';	
-                            $file_paths .= '</div>';
-                        } else {
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
-                        }
-                    }
-                }
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
-
-            endif;
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+		/**
+		 * Filter the file html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the file html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			$files = explode(",", $post->{$cf['htmlvar_name']});
+			if (!empty($files)):
+
+				$extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
+				$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+
+				$file_paths = '';
+				foreach ($files as $file) {
+					if (!empty($file)) {
+
+						// $filetype = wp_check_filetype($file);
+
+						$image_name_arr = explode('/', $file);
+						$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
+						$filename = end($image_name_arr);
+						$img_name_arr = explode('.', $filename);
+
+						$arr_file_type = wp_check_filetype($filename);
+						if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
+							continue;
+						}
+
+						$uploaded_file_type = $arr_file_type['type'];
+						$uploaded_file_ext = $arr_file_type['ext'];
+
+						if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
+							continue; // Invalid file type.
+						}
+
+						//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
+						$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
+
+						// If the uploaded file is image
+						if (in_array($uploaded_file_type, $image_file_types)) {
+							$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
+							$file_paths .= '<a href="'.$file.'">';
+							$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
+							$file_paths .= '</a>';
+							//$file_paths .= '<img src="'.$file.'"  />';	
+							$file_paths .= '</div>';
+						} else {
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+						}
+					}
+				}
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span>';
+				$html .= $file_paths . '</div></div>';
+
+			endif;
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
 
@@ -1368,80 +1368,80 @@ 
  */
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
-        /**
-         * Filter the textarea html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the textarea html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+		/**
+		 * Filter the textarea html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the textarea html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
 
@@ -1459,79 +1459,79 @@ 
  */
 function geodir_cf_html($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
-        /**
-         * Filter the html html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the html html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+		/**
+		 * Filter the html html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the html html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
 
@@ -1549,113 +1549,113 @@ 
  */
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
-        /**
-         * Filter the taxonomy html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the taxonomy html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
-            $field_value = $post->{$html_var};
-            $links = array();
-            $terms = array();
-            $termsOrdered = array();
-            if (!is_array($field_value)) {
-                $field_value = explode(",", trim($field_value, ","));
-            }
-
-            $field_value = array_unique($field_value);
-
-            if (!empty($field_value)) {
-                foreach ($field_value as $term) {
-                    $term = trim($term);
-
-                    if ($term != '') {
-                        $term = get_term_by('id', $term, $html_var);
-                        if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
-                            $terms[] = $term;
-                        }
-                    }
-                }
-                if (!empty($links)) {
-                    // order alphabetically
-                    asort($links);
-                    foreach (array_keys($links) as $key) {
-                        $termsOrdered[$key] = $terms[$key];
-                    }
-                    $terms = $termsOrdered;
-                }
-            }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
-
-            if ($html_value != '') {
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } else if ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
-            }
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+		/**
+		 * Filter the taxonomy html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the taxonomy html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
+			$post_taxonomy = $post->post_type . 'category';
+			$field_value = $post->{$html_var};
+			$links = array();
+			$terms = array();
+			$termsOrdered = array();
+			if (!is_array($field_value)) {
+				$field_value = explode(",", trim($field_value, ","));
+			}
+
+			$field_value = array_unique($field_value);
+
+			if (!empty($field_value)) {
+				foreach ($field_value as $term) {
+					$term = trim($term);
+
+					if ($term != '') {
+						$term = get_term_by('id', $term, $html_var);
+						if (is_object($term)) {
+							$links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+							$terms[] = $term;
+						}
+					}
+				}
+				if (!empty($links)) {
+					// order alphabetically
+					asort($links);
+					foreach (array_keys($links) as $key) {
+						$termsOrdered[$key] = $terms[$key];
+					}
+					$terms = $termsOrdered;
+				}
+			}
+			$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+
+			if ($html_value != '') {
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} else if ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span> ' . $html_value . '</div>';
+			}
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
 
@@ -1672,161 +1672,161 @@ 
  */
 function geodir_cf_address($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
-        /**
-         * Filter the address html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the address html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
-
-        if ($cf['extra_fields']) {
-
-            $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-
-            $addition_fields = '';
-
-            if (!empty($extra_fields)) {
-
-                $show_city_in_address = false;
-                if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
-                    $show_city_in_address = true;
-                }
-                /**
-                 * Filter "show city in address" value.
-                 *
-                 * @since 1.0.0
-                 */
-                $show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
-
-
-                $show_region_in_address = false;
-                if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
-                    $show_region_in_address = true;
-                }
-                /**
-                 * Filter "show region in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
-
-                $show_country_in_address = false;
-                if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
-                    $show_country_in_address = true;
-                }
-                /**
-                 * Filter "show country in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
-
-                $show_zip_in_address = false;
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
-                    $show_zip_in_address = true;
-                }
-                /**
-                 * Filter "show zip in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
-
-
-            }
-
-        }
-
-
-        if ($post->{$html_var}) {
-
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
-                $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
-                $field_icon_af = '<i class="fa fa-home"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon    = '';
-            }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+		/**
+		 * Filter the address html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the address html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		$html_var = $cf['htmlvar_name'] . '_address';
+
+		if ($cf['extra_fields']) {
+
+			$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+
+			$addition_fields = '';
+
+			if (!empty($extra_fields)) {
+
+				$show_city_in_address = false;
+				if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
+					$show_city_in_address = true;
+				}
+				/**
+				 * Filter "show city in address" value.
+				 *
+				 * @since 1.0.0
+				 */
+				$show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
+
+
+				$show_region_in_address = false;
+				if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
+					$show_region_in_address = true;
+				}
+				/**
+				 * Filter "show region in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
+
+				$show_country_in_address = false;
+				if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
+					$show_country_in_address = true;
+				}
+				/**
+				 * Filter "show country in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
+
+				$show_zip_in_address = false;
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+					$show_zip_in_address = true;
+				}
+				/**
+				 * Filter "show zip in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
+
+
+			}
+
+		}
+
+
+		if ($post->{$html_var}) {
+
+			$field_icon = geodir_field_icon_proccess( $cf );
+			if ( strpos( $field_icon, 'http' ) !== false ) {
+				$field_icon_af = '';
+			} elseif ( $field_icon == '' ) {
+				$field_icon_af = '<i class="fa fa-home"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon    = '';
+			}
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+			$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+			$html .= '</span>';
 
-            if ( isset($post->post_address) ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
-            }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
-            }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
-            }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
-            }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
-            }
-            $html .= '</div>';
+			if ( isset($post->post_address) ) {
+				$html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+			}
+			if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
+				$html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+			}
+			if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
+				$html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+			}
+			if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
+				$html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+			}
+			if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
+				$html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+			}
+			$html .= '</div>';
 
-        }
+		}
 
-    }
+	}
 
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file

Spacing +302 added lines, -302 removed lines

@@ -19,21 +19,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_checkbox_loc_{$location}")) {
         /**
          * Filter the checkbox html by location.
          *
@@ -41,11 +41,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -54,11 +54,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")) {
         /**
          * Filter the checkbox html by field type key.
          *
@@ -67,18 +67,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ( (int) $post->{$html_var} == 1 ):
+        if ((int) $post->{$html_var} == 1):
 
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
+            if ($post->{$html_var} == '1'):
+                $html_val = __('Yes', 'geodirectory');
             else:
-                $html_val = __( 'No', 'geodirectory' );
+                $html_val = __('No', 'geodirectory');
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -91,16 +91,16 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
 
 
 /**
@@ -113,21 +113,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_fieldset_loc_{$location}")) {
         /**
          * Filter the fieldset html by location.
          *
@@ -135,11 +135,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -148,11 +148,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")) {
         /**
          * Filter the fieldset html by field type key.
          *
@@ -161,11 +161,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $field_set_start;
         $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
@@ -173,7 +173,7 @@ 
         if ($field_set_start == 1) {
             $html = '';
         } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+            $html = '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
             //$field_set_start = 1;
         }
 
@@ -181,7 +181,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
 
 
 /**
@@ -194,21 +194,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_url($html,$location,$cf,$p=''){
+function geodir_cf_url($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_url_loc_{$location}")) {
         /**
          * Filter the url html by location.
          *
@@ -216,11 +216,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_var_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -229,11 +229,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")) {
         /**
          * Filter the url html by field type key.
          *
@@ -242,11 +242,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -273,7 +273,7 @@ 
 
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
 
 
@@ -289,7 +289,7 @@ 
              * @param string $website Website URL.
              * @param int $post->ID Post ID.
              */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
 
         endif;
 
@@ -297,7 +297,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
 
 
 /**
@@ -310,21 +310,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_phone($html,$location,$cf,$p=''){
+function geodir_cf_phone($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_phone_loc_{$location}")) {
         /**
          * Filter the phone html by location.
          *
@@ -332,11 +332,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_var_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -345,11 +345,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")) {
         /**
          * Filter the phone html by field type key.
          *
@@ -358,11 +358,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -377,9 +377,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
 
         endif;
 
@@ -387,7 +387,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
 
 
 /**
@@ -400,21 +400,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_time($html,$location,$cf,$p=''){
+function geodir_cf_time($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_time_loc_{$location}")) {
         /**
          * Filter the time html by location.
          *
@@ -422,11 +422,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_var_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -435,11 +435,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")) {
         /**
          * Filter the time html by field type key.
          *
@@ -448,11 +448,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -472,9 +472,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -482,7 +482,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
 
 
 /**
@@ -495,21 +495,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
     global $preview;
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_datepicker_loc_{$location}")) {
         /**
          * Filter the datepicker html by location.
          *
@@ -517,11 +517,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -530,11 +530,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")) {
         /**
          * Filter the datepicker html by field type key.
          *
@@ -543,11 +543,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -558,24 +558,24 @@ 
             }
             // check if we need to change the format or not
             $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
 
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                 $date_format = str_replace($search, $replace, $date_format);
 
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+            } else {
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
                 $date_format_from = $preview ? $date_format : 'Y-m-d';
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else {
                 return '';
             }
 
@@ -592,9 +592,9 @@ 
 
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -602,7 +602,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
 
 
 /**
@@ -615,21 +615,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_text($html,$location,$cf,$p=''){
+function geodir_cf_text($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_text_loc_{$location}")) {
         /**
          * Filter the text html by location.
          *
@@ -637,11 +637,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_var_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -650,11 +650,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")) {
         /**
          * Filter the text html by field type key.
          *
@@ -663,15 +663,15 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -686,16 +686,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+            if (isset($cf['data_type']) && ($cf['data_type'] == 'INT' || $cf['data_type'] == 'FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']) {
                 $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
+                    if (!ceil($value) > 0) {return ''; }// dont output blank prices
+                    $value = geodir_currency_format_number($value, $cf);
                 }
             }
 
@@ -709,7 +709,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
 
 
 /**
@@ -722,21 +722,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_radio($html,$location,$cf,$p=''){
+function geodir_cf_radio($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_radio_loc_{$location}")) {
         /**
          * Filter the radio html by location.
          *
@@ -744,11 +744,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_var_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -757,11 +757,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")) {
         /**
          * Filter the radio html by field type key.
          *
@@ -770,11 +770,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
         if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
@@ -808,16 +808,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
 
 
 /**
@@ -831,21 +831,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_select($html,$location,$cf,$p=''){
+function geodir_cf_select($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_select_loc_{$location}")) {
         /**
          * Filter the select html by location.
          *
@@ -853,11 +853,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_var_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -866,11 +866,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")) {
         /**
          * Filter the select html by field type key.
          *
@@ -879,11 +879,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -911,16 +911,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$field_value.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
 
 
 /**
@@ -933,21 +933,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_multiselect_loc_{$location}")) {
         /**
          * Filter the multiselect html by location.
          *
@@ -955,11 +955,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -968,11 +968,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")) {
         /**
          * Filter the multiselect html by field type key.
          *
@@ -981,11 +981,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
 
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -1006,7 +1006,7 @@ 
 
             $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
 
-            if(is_array($field_values)){
+            if (is_array($field_values)) {
                 $field_values = array_map('trim', $field_values);
             }
 
@@ -1024,15 +1024,15 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             if (count($option_values) > 1) {
                 $html .= '<ul>';
 
                 foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
+                    $html .= '<li>'.$val.'</li>';
                 }
 
                 $html .= '</ul>';
@@ -1047,7 +1047,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
 
 
 /**
@@ -1060,21 +1060,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_email($html,$location,$cf,$p=''){
+function geodir_cf_email($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_email_loc_{$location}")) {
         /**
          * Filter the email html by location.
          *
@@ -1082,11 +1082,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_var_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -1095,11 +1095,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")) {
         /**
          * Filter the email html by field type key.
          *
@@ -1108,18 +1108,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
             return ''; // Remove Send Enquiry | Send To Friend from listings page
         }
 
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+        $package_info = (array) geodir_post_package_info(array(), $post, $post->post_type);
 
         if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
             global $send_to_friend;
@@ -1131,7 +1131,7 @@ 
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
                 $b_sendtofriend = 'b_sendtofriend';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
             }
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1144,28 +1144,28 @@ 
                 $field_icon = '';
             }
 
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
             $seperator = '';
             if ($post->{$cf['htmlvar_name']}) {
                 $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="'.$b_send_inquiry_url.'" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
                 $b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
-                $html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="'.$b_sendtofriend_url.'" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</a>';
             }
 
             $html .= '</span></div>';
 
 
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_FRIEND_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
             }
 
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1185,11 +1185,11 @@ 
                 }
 
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span><span class="geodir-email-address-output">';
                 $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
+                if ($e_split = explode('@', $email)) {
                     /**
                      * Filter email custom field name output.
                      *
@@ -1198,10 +1198,10 @@ 
                      * @param string $email The email string being output.
                      * @param array $cf Custom field variables array.
                      */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1212,7 +1212,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
 
 
 /**
@@ -1225,21 +1225,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_file($html,$location,$cf,$p=''){
+function geodir_cf_file($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_file_loc_{$location}")) {
         /**
          * Filter the file html by location.
          *
@@ -1247,11 +1247,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_var_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1260,11 +1260,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")) {
         /**
          * Filter the file html by field type key.
          *
@@ -1273,11 +1273,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})):
 
@@ -1285,7 +1285,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
                 $file_paths = '';
                 foreach ($files as $file) {
@@ -1322,9 +1322,9 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1339,11 +1339,11 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
+                $html .= $file_paths.'</div></div>';
 
             endif;
         endif;
@@ -1352,7 +1352,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
 
 
 
@@ -1366,21 +1366,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_textarea($html,$location,$cf,$p=''){
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_textarea_loc_{$location}")) {
         /**
          * Filter the textarea html by location.
          *
@@ -1388,11 +1388,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_var_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -1401,11 +1401,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")) {
         /**
          * Filter the textarea html by field type key.
          *
@@ -1414,11 +1414,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1433,9 +1433,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1443,7 +1443,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
 
 
 
@@ -1457,21 +1457,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_html($html,$location,$cf,$p=''){
+function geodir_cf_html($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_html_loc_{$location}")) {
         /**
          * Filter the html html by location.
          *
@@ -1479,11 +1479,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_var_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -1492,11 +1492,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")) {
         /**
          * Filter the html html by field type key.
          *
@@ -1505,11 +1505,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1523,9 +1523,9 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1533,7 +1533,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
 
 
 
@@ -1547,21 +1547,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")) {
         /**
          * Filter the taxonomy html by location.
          *
@@ -1569,11 +1569,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1582,11 +1582,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")) {
         /**
          * Filter the taxonomy html by field type key.
          *
@@ -1595,14 +1595,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
+            $post_taxonomy = $post->post_type.'category';
             $field_value = $post->{$html_var};
             $links = array();
             $terms = array();
@@ -1620,7 +1620,7 @@ 
                     if ($term != '') {
                         $term = get_term_by('id', $term, $html_var);
                         if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
                             $terms[] = $term;
                         }
                     }
@@ -1634,7 +1634,7 @@ 
                     $terms = $termsOrdered;
                 }
             }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
 
             if ($html_value != '') {
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1647,9 +1647,9 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+                $html .= '</span> '.$html_value.'</div>';
             }
         }
 
@@ -1657,7 +1657,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
 
 
 /**
@@ -1670,21 +1670,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_address($html,$location,$cf,$p=''){
+function geodir_cf_address($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_address_loc_{$location}")) {
         /**
          * Filter the address html by location.
          *
@@ -1692,11 +1692,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_var_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -1705,11 +1705,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")) {
         /**
          * Filter the address html by field type key.
          *
@@ -1718,14 +1718,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
+        $html_var = $cf['htmlvar_name'].'_address';
 
         if ($cf['extra_fields']) {
 
@@ -1788,10 +1788,10 @@ 
 
         if ($post->{$html_var}) {
 
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
+            $field_icon = geodir_field_icon_proccess($cf);
+            if (strpos($field_icon, 'http') !== false) {
                 $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
+            } elseif ($field_icon == '') {
                 $field_icon_af = '<i class="fa fa-home"></i>';
             } else {
                 $field_icon_af = $field_icon;
@@ -1800,25 +1800,25 @@ 
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
             $html .= '</span>';
 
-            if ( isset($post->post_address) ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+            if (isset($post->post_address)) {
+                $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';
             }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+            if ($show_city_in_address && isset($post->post_city) && $post->post_city) {
+                $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';
             }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+            if ($show_region_in_address && isset($post->post_region) && $post->post_region) {
+                $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';
             }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+            if ($show_zip_in_address && isset($post->post_zip) && $post->post_zip) {
+                $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';
             }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+            if ($show_country_in_address && isset($post->post_country) && $post->post_country) {
+                $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';
             }
             $html .= '</div>';
 
@@ -1829,4 +1829,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory-functions/listing_filters.php

Braces +30 added lines, -19 removed lines

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

 function geodir_session_start()

 {

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

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

 

     $geodir_add_location_url = NULL;

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

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

 

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

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

 

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

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

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

         geodir_post_where();

-        if (!is_admin())

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

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

         // advanced filter for popular post view widget

         global $wp_query;

@@ -349,8 +354,9 @@ 
     $sort_by = '';

     $orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

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

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

         $current_term = $wp_query->get_queried_object();

@@ -370,14 +376,16 @@ 
         $orderby .= " distance,";

     }

 

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

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

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

 

     if ($sort_by == '') {

         $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

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

 

     /*

@@ -572,8 +580,9 @@ 
 

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

 

-            if ($snear != '')

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

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

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

 

@@ -727,10 +736,11 @@ 
 

     $where = '';

     $better_search_terms = '';

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

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

-    else

-        $post_types = 'gd_place';

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

     if ($s != '') {

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

@@ -767,7 +777,7 @@ 
     if($taxonomies) {

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

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else{$taxonomies='';}

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -887,8 +897,9 @@ 
             $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

             $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

             $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

+        } else {
+                    $where .= " AND $wpdb->posts.post_author = $user_id";
+        }
 

         if ($user_id == (int)get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

Indentation +546 added lines, -546 removed lines

@@ -16,10 +16,10 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

-    global $geodir_add_location_url;

+	if (!session_id()) session_start();

+	global $geodir_add_location_url;

 

-    $geodir_add_location_url = NULL;

+	$geodir_add_location_url = NULL;

 }

 

 /**

@@ -33,18 +33,18 @@ 
  */

 function geodir_modified_query($query)

 {

-    if ($query->is_main_query() && (

-            (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            || geodir_is_page('listing')

-            || geodir_is_page('author')

-            || geodir_is_page('search')

-            || geodir_is_page('detail'))

-    ) {

-

-        $query->set('is_geodir_loop', true);

-    }

+	if ($query->is_main_query() && (

+			(geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

+			|| geodir_is_page('listing')

+			|| geodir_is_page('author')

+			|| geodir_is_page('search')

+			|| geodir_is_page('detail'))

+	) {

+

+		$query->set('is_geodir_loop', true);

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -67,81 +67,81 @@ 
  */

 function set_listing_request($query )

 {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

 

-    // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    /* remove all pre filters */

-    remove_all_filters('query');

-    remove_all_filters('posts_search');

-    remove_all_filters('posts_fields');

-    remove_all_filters('posts_join');

-    remove_all_filters('posts_orderby');

-    remove_all_filters('posts_where');

+	/* remove all pre filters */

+	remove_all_filters('query');

+	remove_all_filters('posts_search');

+	remove_all_filters('posts_fields');

+	remove_all_filters('posts_join');

+	remove_all_filters('posts_orderby');

+	remove_all_filters('posts_where');

 

 

-    if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

+	if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

-        //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

+		if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+		//if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

-        if (isset($_REQUEST['sdist'])) {

-            ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

-        } elseif (get_option('geodir_search_dist') != '') {

-            $dist = get_option('geodir_search_dist');

+		if (isset($_REQUEST['sdist'])) {

+			($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

+		} elseif (get_option('geodir_search_dist') != '') {

+			$dist = get_option('geodir_search_dist');

 

-        } else {

-            $dist = 25000;

-        } //  Distance

+		} else {

+			$dist = 25000;

+		} //  Distance

 

-        if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

-        } else {

-            $mylat = (float)geodir_get_current_city_lat();

-        } //  Latitude

+		if (isset($_REQUEST['sgeo_lat'])) {

+			$mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+		} else {

+			$mylat = (float)geodir_get_current_city_lat();

+		} //  Latitude

 

-        if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

-        } else {

-            $mylon = (float)geodir_get_current_city_lng();

-        } //  Distance

+		if (isset($_REQUEST['sgeo_lon'])) {

+			$mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+		} else {

+			$mylon = (float)geodir_get_current_city_lng();

+		} //  Distance

 

-        if (isset($_REQUEST['snear'])) {

-            $snear = trim(esc_attr($_REQUEST['snear']));

-        }

+		if (isset($_REQUEST['snear'])) {

+			$snear = trim(esc_attr($_REQUEST['snear']));

+		}

 

-        if (isset($_REQUEST['s'])) {

-            $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

-        }

+		if (isset($_REQUEST['s'])) {

+			$s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

+		}

 

-        if ($snear == 'NEAR ME') {

-            $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

-            $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude]));

-            $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude]));

-        }

+		if ($snear == 'NEAR ME') {

+			$ip = $_SERVER['REMOTE_ADDR'];

+			$addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+			$mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude]));

+			$mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude]));

+		}

 

 

-        if (strstr($s, ',')) {

-            $s_AA = str_replace(" ", "", $s);

-            $s_A = explode(",", $s_AA);

-            $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

-        } else {

-            $s_A = '"' . $s . '"';

-        }

+		if (strstr($s, ',')) {

+			$s_AA = str_replace(" ", "", $s);

+			$s_A = explode(",", $s_AA);

+			$s_A = implode('","', $s_A);

+			$s_A = '"' . $s_A . '"';

+		} else {

+			$s_A = '"' . $s . '"';

+		}

 

-        if (strstr($s, ' ')) {

-            $s_SA = explode(" ", $s);

-        } else {

-            $s_SA = '';

-        }

+		if (strstr($s, ' ')) {

+			$s_SA = explode(" ", $s);

+		} else {

+			$s_SA = '';

+		}

 

-    endif;

+	endif;

 

 

 

@@ -162,56 +162,56 @@ 
  */

 function geodir_listing_loop_filter($query)

 {

-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

 

-    // fix wp_reset_query for popular post view widget

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix wp_reset_query for popular post view widget

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    $geodir_post_type = geodir_get_current_posttype();

-

-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

-

-        if (isset($wp_query->query[$taxonomies[0]])) {

-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);

-            $request_term = end($request_term);

-            if (!term_exists($request_term)) {

-                $args = array('number' => '1',);

-                $terms_arr = get_terms($taxonomies[0], $args);

-                foreach ($terms_arr as $location_term) {

-                    $term_arr = $location_term;

-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

-                }

-                $wp_query->queried_object_id = 1;

-                $wp_query->queried_object = $term_arr;

-                //print_r($wp_query) ;

-            }

-        }

+	$geodir_post_type = geodir_get_current_posttype();

+

+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

+

+		if (isset($wp_query->query[$taxonomies[0]])) {

+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);

+			$request_term = end($request_term);

+			if (!term_exists($request_term)) {

+				$args = array('number' => '1',);

+				$terms_arr = get_terms($taxonomies[0], $args);

+				foreach ($terms_arr as $location_term) {

+					$term_arr = $location_term;

+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

+				}

+				$wp_query->queried_object_id = 1;

+				$wp_query->queried_object = $term_arr;

+				//print_r($wp_query) ;

+			}

+		}

 

-    }

-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

-

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

-

-        add_filter('posts_fields', 'geodir_posts_fields', 1);

-        add_filter('posts_join', 'geodir_posts_join', 1);

-        geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

-

-        // advanced filter for popular post view widget

-        global $wp_query;

-        if (!is_admin()) {

-            if (!empty($wp_query->query['with_pics_only'])) {

-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);

-            }

-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);

-        }

+	}

+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-    }

-    return $query;

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

+

+		add_filter('posts_fields', 'geodir_posts_fields', 1);

+		add_filter('posts_join', 'geodir_posts_join', 1);

+		geodir_post_where();

+		if (!is_admin())

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+

+		// advanced filter for popular post view widget

+		global $wp_query;

+		if (!is_admin()) {

+			if (!empty($wp_query->query['with_pics_only'])) {

+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);

+			}

+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);

+		}

+

+	}

+	return $query;

 }

 

 

@@ -230,67 +230,67 @@ 
  * @return string Modified fields query string.

  */

 function geodir_posts_fields($fields) {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

-    // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+	// Filter-Location-Manager to add location table.

+	$fields .= ", " . $table . ".* ";

 

 	if ($snear != '' || $gd_session->get('all_near_me')) {

-        $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+		$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

 		if ($gd_session->get('all_near_me')) {

-            $mylat = $gd_session->get('user_lat');

-            $mylon = $gd_session->get('user_lon');

-        }

-

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    }

-

-    global $s;

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+			$mylat = $gd_session->get('user_lat');

+			$mylon = $gd_session->get('user_lon');

+		}

 

+		$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	}

 

-        if (count($keywords) > 1) {

-            $parts = array(

-                'AND' => 'gd_alltitlematch_part',

-                'OR' => 'gd_titlematch_part'

-            );

-            $gd_titlematch_part = "";

-            foreach ($parts as $key => $part) {

-                $gd_titlematch_part .= " CASE WHEN ";

-                $count = 0;

-                foreach ($keywords as $keyword) {

-                    $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+	global $s;

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(geodir_utf8_strlen($kword)<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+

+		if (count($keywords) > 1) {

+			$parts = array(

+				'AND' => 'gd_alltitlematch_part',

+				'OR' => 'gd_titlematch_part'

+			);

+			$gd_titlematch_part = "";

+			foreach ($parts as $key => $part) {

+				$gd_titlematch_part .= " CASE WHEN ";

+				$count = 0;

+				foreach ($keywords as $keyword) {

+					$keyword = trim($keyword);

+					$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

 					$count++;

-                    if ($count < count($keywords)) {

-                       // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

+					if ($count < count($keywords)) {

+					   // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

-                    } else {

-                        //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

+					} else {

+						//$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

-                    }

-                }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

-            }

-        } else {

-            $gd_titlematch_part = "";

-        }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

+					}

+				}

+				$gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+			}

+		} else {

+			$gd_titlematch_part = "";

+		}

+		$s = stripslashes_deep( $s );

+		$s = wp_specialchars_decode($s,ENT_QUOTES);

 		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -307,26 +307,26 @@ 
  */

 function geodir_posts_join($join)

 {

-    global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

+	global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

 

-    ########### WPML ###########

+	########### WPML ###########

 

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

-        }

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		if ($lang_code) {

+			$join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

-    //===old code start

-    //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

+	$join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+	//===old code start

+	//$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

-    return $join;

+	return $join;

 }

 

 

@@ -344,15 +344,15 @@ 
  */

 function geodir_posts_orderby($orderby)

 {

-    global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

+	global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

 

-    $sort_by = '';

-    $orderby = ' ';

+	$sort_by = '';

+	$orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+	if (get_query_var('order_by'))

+		$sort_by = get_query_var('order_by');

 

-    /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

+	/*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

     }

 

@@ -366,133 +366,133 @@ 
     }*/

 

 

-    if ($snear != '') {

-        $orderby .= " distance,";

-    }

+	if ($snear != '') {

+		$orderby .= " distance,";

+	}

 

-    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+	if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query())

+		$sort_by = esc_attr($_REQUEST['sort_by']);

 

 

-    if ($sort_by == '') {

-        $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

-    }

+	if ($sort_by == '') {

+		$default_sort = geodir_get_posts_default_sort($geodir_post_type);

+		if (!empty($default_sort))

+			$sort_by = $default_sort;

+	}

 

-    /*

+	/*

     if search by term & no location then order always "relevance"

     if search by location then order always "nearest"

     */

-    if (is_main_query() && geodir_is_page('search')) {

-        $search_term = get_query_var('s');

+	if (is_main_query() && geodir_is_page('search')) {

+		$search_term = get_query_var('s');

 

-        if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

-            $sort_by = 'az';

-        }

+		if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

+			$sort_by = 'az';

+		}

 

-        if ($snear != '' &&  $sort_by!='farthest') {

-            $sort_by = 'nearest';

-        }

-    }

-

-    switch ($sort_by):

-        case 'newest':

-            $orderby = "$wpdb->posts.post_date desc, ";

-            break;

-        case 'oldest':

-            $orderby = "$wpdb->posts.post_date asc, ";

-            break;

-        case 'low_review':

-        case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

-            break;

-        case 'high_review':

-        case 'rating_count_desc':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

-            break;

-        case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

-            break;

-        case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'featured':

-            $orderby = $table . ".is_featured asc, ";

-            break;

-        case 'nearest':

-            $orderby = " distance asc, ";

-            break;

-        case 'farthest':

-            $orderby = " distance desc, ";

-            break;

-        case 'random':

-            $orderby = " rand(), ";

-            break;

-        case 'az':

-            $orderby = "$wpdb->posts.post_title asc, ";

-            break;

-        // sort by rating

-        case 'overall_rating_desc':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'overall_rating_asc':

-            $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

-            break;

-        default:

-

-            break;

-    endswitch;

-

-    if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {

-        if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {

-            $orderby = "$wpdb->posts.comment_count DESC, ";

-            $sort_by = 'comment_count_desc';

-        } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {

-            $orderby = "$wpdb->posts.comment_count ASC, ";

-            $sort_by = 'comment_count_asc';

-        }

-    }

+		if ($snear != '' &&  $sort_by!='farthest') {

+			$sort_by = 'nearest';

+		}

+	}

 

-    global $s;

+	switch ($sort_by):

+		case 'newest':

+			$orderby = "$wpdb->posts.post_date desc, ";

+			break;

+		case 'oldest':

+			$orderby = "$wpdb->posts.post_date asc, ";

+			break;

+		case 'low_review':

+		case 'rating_count_asc':

+			$orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+			break;

+		case 'high_review':

+		case 'rating_count_desc':

+			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			break;

+		case 'low_rating':

+			$orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+			break;

+		case 'high_rating':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'featured':

+			$orderby = $table . ".is_featured asc, ";

+			break;

+		case 'nearest':

+			$orderby = " distance asc, ";

+			break;

+		case 'farthest':

+			$orderby = " distance desc, ";

+			break;

+		case 'random':

+			$orderby = " rand(), ";

+			break;

+		case 'az':

+			$orderby = "$wpdb->posts.post_title asc, ";

+			break;

+		// sort by rating

+		case 'overall_rating_desc':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'overall_rating_asc':

+			$orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

+			break;

+		default:

+

+			break;

+	endswitch;

+

+	if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {

+		if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {

+			$orderby = "$wpdb->posts.comment_count DESC, ";

+			$sort_by = 'comment_count_desc';

+		} else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {

+			$orderby = "$wpdb->posts.comment_count ASC, ";

+			$sort_by = 'comment_count_asc';

+		}

+	}

 

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

-        if ($sort_by == 'nearest' || $sort_by == 'farthest') {

-            if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

-            } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

-            }

-        } else {

-            if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

-            } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

-            }

-        }

-    }

+	global $s;

+

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(geodir_utf8_strlen($kword)<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+		if ($sort_by == 'nearest' || $sort_by == 'farthest') {

+			if (count($keywords) > 1) {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+			} else {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+			}

+		} else {

+			if (count($keywords) > 1) {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+			} else {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+			}

+		}

+	}

 

-    /**

-     * Filter order by SQL.

-     *

-     * @since 1.0.0

-     * @param string $orderby The orderby query string.

-     * @param string $sort_by Sortby query string.

-     * @param string $table Listing table name.

-     */

-    $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

+	/**

+	 * Filter order by SQL.

+	 *

+	 * @since 1.0.0

+	 * @param string $orderby The orderby query string.

+	 * @param string $sort_by Sortby query string.

+	 * @param string $table Listing table name.

+	 */

+	$orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+	$orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

-    return $orderby;

+	return $orderby;

 }

 

 

@@ -510,53 +510,53 @@ 
 function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

+	if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

 

-        $sort_array = explode('_', $sort_by);

+		$sort_array = explode('_', $sort_by);

 

-        $sort_by_count = count($sort_array);

+		$sort_by_count = count($sort_array);

 

-        $order = $sort_array[$sort_by_count - 1];

+		$order = $sort_array[$sort_by_count - 1];

 

-        if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

+		if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+			$sort_by = str_replace('_' . $order, '', $sort_by);

 

-            switch ($sort_by):

+			switch ($sort_by):

 

-                case 'post_date':

-                case 'comment_count':

+				case 'post_date':

+				case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

-                    break;

+					$orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+					break;

 

-                case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

-                    break;

+				case 'distance':

+					$orderby = $sort_by . " " . $order . ", ";

+					break;

 

 

-                // sort by rating

-                case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+				// sort by rating

+				case 'overall_rating':

+					$orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

 

-                    break;

+					break;

 

 

-                default:

-                    if (geodir_column_exist($table, $sort_by)) {

+				default:

+					if (geodir_column_exist($table, $sort_by)) {

 						$orderby = $table . "." . $sort_by . " " . $order . ", ";

 					}

-                    break;

+					break;

 

-            endswitch;

+			endswitch;

 

-        }

+		}

 

-    }

+	}

 

-    return $orderby;

+	return $orderby;

 }

 

 /**

@@ -571,34 +571,34 @@ 
 {

 

 

-    global $wpdb, $geodir_post_type, $table, $s, $snear;

+	global $wpdb, $geodir_post_type, $table, $s, $snear;

 

-    if (!is_admin()) {

+	if (!is_admin()) {

 

-        if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            add_filter('posts_where', 'geodir_edit_listing_where', 1);

+		if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			add_filter('posts_where', 'geodir_edit_listing_where', 1);

 

-        } elseif ((is_search() && $_REQUEST['geodir_search'])) {

+		} elseif ((is_search() && $_REQUEST['geodir_search'])) {

 

-            add_filter('posts_where', 'searching_filter_where', 1);

+			add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+			if ($snear != '')

+				add_filter('posts_where', 'searching_filter_where', 1);

 

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

-        } elseif (geodir_is_page('author')) {

+		} elseif (geodir_is_page('author')) {

 

-            add_filter('posts_where', 'author_filter_where', 1);

+			add_filter('posts_where', 'author_filter_where', 1);

 

-        }

+		}

 

-        //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+		//if (!geodir_is_page('detail'))

+			add_filter('posts_where', 'geodir_default_where', 1);/**/

 

-        //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

+		//add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

-    }

+	}

 }

 

 /**

@@ -613,13 +613,13 @@ 
  */

 function geodir_preview_post_cap($allcaps, $caps, $args)

 {

-    $user_id = get_current_user_id();

-    if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

+	$user_id = get_current_user_id();

+	if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

 

-        $allcaps['edit_posts'] = true;

-    }

-    //print_r($allcaps);

-    return $allcaps;

+		$allcaps['edit_posts'] = true;

+	}

+	//print_r($allcaps);

+	return $allcaps;

 }

 

 

@@ -634,9 +634,9 @@ 
  */

 function geodir_edit_listing_where($where)

 {

-    global $wpdb;

-    $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

-    return $where;

+	global $wpdb;

+	$where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

+	return $where;

 }

 

 

@@ -653,29 +653,29 @@ 
  */

 function geodir_default_where($where)

 {

-    global $wp_query, $wpdb;

-

-    //print_r($wp_query);

-    ########### WPML ###########

-

-    if (function_exists('icl_object_id')) {

-        global $sitepress, $table_prefix;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

-        //echo '##########'.$q_post_type;

-        if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

-            //$where .= " AND icl_t.language_code = '$lang_code' ";

-        }

+	global $wp_query, $wpdb;

 

-    }

-    ########### WPML ###########

+	//print_r($wp_query);

+	########### WPML ###########

 

+	if (function_exists('icl_object_id')) {

+		global $sitepress, $table_prefix;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		$q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

+		//echo '##########'.$q_post_type;

+		if ($lang_code && $q_post_type) {

+			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+			//$where .= " AND icl_t.language_code = '$lang_code' ";

+		}

 

-    return $where = str_replace("0 = 1", "1=1", $where);

+	}

+	########### WPML ###########

+

+

+	return $where = str_replace("0 = 1", "1=1", $where);

 

-    /* ====== old code start ===

+	/* ====== old code start ===

     $where = str_replace("0 = 1", "1=1", $where);

     $country = get_query_var('gd_country');

     $region = get_query_var('gd_region');

@@ -716,108 +716,108 @@ 
  * @return string Modified where query string.

  */

 function searching_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

+	global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

 

-    $search_term = 'OR';

-    $search_term = 'AND';

-    $geodir_custom_search = '';

-    $category_search_range = '';

+	$search_term = 'OR';

+	$search_term = 'AND';

+	$geodir_custom_search = '';

+	$category_search_range = '';

 

-    if (is_single() && get_query_var('post_type')) {

+	if (is_single() && get_query_var('post_type')) {

 		return $where;

 	}

 

-    if (is_tax()) {

+	if (is_tax()) {

 		return $where;

 	}

 

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

-

-    $where = '';

-    $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

-

-    if ($s != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+	$s  = wp_specialchars_decode($s ,ENT_QUOTES);

+	$s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+

+	$where = '';

+	$better_search_terms = '';

+	if (isset($_REQUEST['stype']))

+		$post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

+	else

+		$post_types = 'gd_place';

 

-        if (!empty($keywords)) {

-            foreach ($keywords as $keyword) {

-                $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

-                if ($keyword != '') {

-                    /**

-                     * Filter the search query keywords SQL.

-                     *

-                     * @since 1.5.9

-                     * @package GeoDirectory

-                     * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

-                     * @param array $keywords The array of keywords for the query.

-                     * @param string $keyword The single keyword being searched.

-                     */

+	if ($s != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(geodir_utf8_strlen($kword)<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+		if (!empty($keywords)) {

+			foreach ($keywords as $keyword) {

+				$keyword = trim($keyword);

+				$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+				if ($keyword != '') {

+					/**

+					 * Filter the search query keywords SQL.

+					 *

+					 * @since 1.5.9

+					 * @package GeoDirectory

+					 * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

+					 * @param array $keywords The array of keywords for the query.

+					 * @param string $keyword The single keyword being searched.

+					 */

 					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

-                }

-            }

-        }

-    }

+				}

+			}

+		}

+	}

 

-    /* get taxonomy */

-    $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

-        $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+	/* get taxonomy */

+	$taxonomies = geodir_get_taxonomies($post_types, true);

+	if($taxonomies) {

+		$taxonomies = implode("','", $taxonomies);

+		$taxonomies = "'" . $taxonomies . "'";

+	}else{$taxonomies='';}

 

-    $content_where = $terms_where = '';

+	$content_where = $terms_where = '';

 	if ($s != '') {

-        /**

-         * Filter the search query content where values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

-         */

+		/**

+		 * Filter the search query content where values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

+		 */

 		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

-        /**

-         * Filter the search query term values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

-         */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+		/**

+		 * Filter the search query term values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

+		 */

+		$terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 

-    if ($snear != '') {

+	if ($snear != '') {

 

 

-        if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

-            $dist = $gd_session->get('near_me_range');

-        }

-        $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lat1 = $mylat - ($dist / 69);

-        $lat2 = $mylat + ($dist / 69);

+		if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

+			$dist = $gd_session->get('near_me_range');

+		}

+		$lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lat1 = $mylat - ($dist / 69);

+		$lat2 = $mylat + ($dist / 69);

 

-        $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

-        $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

-        $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

-        $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

+		$rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

+		$rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

+		$rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

+		$rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

 

 

 

-	    $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+		$where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

 			                    $content_where 

 								OR ($wpdb->posts.ID IN( 

 										SELECT $wpdb->term_relationships.object_id as post_id 

@@ -834,13 +834,13 @@ 
 						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

 						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

 

-        if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

-            $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

-        }

+		if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

+			$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+			$where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+		}

 

-    } else {

-        $where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+	} else {

+		$where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

                             $content_where  

 							OR ( $wpdb->posts.ID IN(	

 									SELECT $wpdb->term_relationships.object_id as post_id                     

@@ -854,19 +854,19 @@ 
 					) 

 				AND $wpdb->posts.post_type in ('$post_types')

 				AND ($wpdb->posts.post_status = 'publish') ";

-    }

+	}

 

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {

+	if ( function_exists( 'icl_object_id' ) ) {

 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

-        }

-    }

-    ########### WPML ###########

+			$where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+		}

+	}

+	########### WPML ###########

 

-    return $where;

+	return $where;

 }

 

 

@@ -881,45 +881,45 @@ 
  * @return string Modified where query string.

  */

 function author_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $curr;

+	global $wpdb, $geodir_post_type, $table, $curr;

 

-    $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+	$curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

+	$user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

 

-    if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

-    } else {

-        $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

-    }

+	if (isset($_REQUEST['stype'])) {

+		$where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+	} else {

+		$where = " AND $wpdb->posts.post_type IN ('gd_place') ";

+	}

 

-    if ($user_id > 0) {

-        if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-            $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

-            $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

-            $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

-

-        if ($user_id == (int)get_current_user_id()) {

-            $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

-        } else {

-            $where .= " AND $wpdb->posts.post_status = 'publish' ";

-        }

-    } else {

-        $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

-    }

+	if ($user_id > 0) {

+		if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

+			$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

+			$user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

+			$where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

+		} else

+			$where .= " AND $wpdb->posts.post_author = $user_id";

+

+		if ($user_id == (int)get_current_user_id()) {

+			$where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

+		} else {

+			$where .= " AND $wpdb->posts.post_status = 'publish' ";

+		}

+	} else {

+		$where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

+	}

 

-    ########### WPML ###########

-    if (function_exists('icl_object_id')) {

-        $lang_code = ICL_LANGUAGE_CODE;

-        if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

-        }

+	########### WPML ###########

+	if (function_exists('icl_object_id')) {

+		$lang_code = ICL_LANGUAGE_CODE;

+		if ($lang_code) {

+			$where .= " AND icl_t.language_code='" . $lang_code . "' ";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    return $where;

+	return $where;

 }

 

 /**

@@ -934,11 +934,11 @@ 
  */

 function geodir_filter_widget_join($join)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

-    }

-    return $join;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	}

+	return $join;

 }

 

 /**

@@ -953,43 +953,43 @@ 
  */

 function geodir_filter_widget_where($where)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

-    }

-    if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

-    }

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

-    }

-    if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

-    }

-    return $where;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['show_featured_only'])) {

+		$where .= " AND " . $table . ".is_featured = '1'";

+	}

+	if (!empty($wp_query->query['show_special_only'])) {

+		$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+	}

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+	}

+	if (!empty($wp_query->query['with_videos_only'])) {

+		$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+	}

+	return $where;

 }

 

 

 function geodir_related_posts_fields($fields) {

-    global $wp_query, $wpdb, $table, $post;

+	global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+	$fields .= ", " . $table . ".* ";

 

-    $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+	$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

-    $mylat = $post->post_latitude;

-    $mylon = $post->post_longitude;

+	$mylat = $post->post_latitude;

+	$mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    return $fields;

+	$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

-        && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

-        && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

-    ) {

-        add_filter('posts_fields', 'geodir_related_posts_fields', 1);

-    }

+	if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+		&& isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

+		&& isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

+	) {

+		add_filter('posts_fields', 'geodir_related_posts_fields', 1);

+	}

 }

 add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);

 

@@ -1004,28 +1004,28 @@ 
  * @return string|null If field exists in table returns order by clause else returns empty.

  */

 function geodir_prepare_custom_sorting( $sorting, $table ) {

-    $orderby = '';

+	$orderby = '';

     

-    if ( empty( $sorting ) || empty( $table ) ) {

-        return $orderby;

-    }

+	if ( empty( $sorting ) || empty( $table ) ) {

+		return $orderby;

+	}

     

-    if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {

-        $sorting_array = explode( '_', $sorting );

+	if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {

+		$sorting_array = explode( '_', $sorting );

         

-        if ( ( $count = count( $sorting_array ) ) > 1 ) {

-            $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : '';

-            array_pop( $sorting_array );

+		if ( ( $count = count( $sorting_array ) ) > 1 ) {

+			$order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : '';

+			array_pop( $sorting_array );

             

-            if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {

-                $sort_by = implode( '_', $sorting_array );

+			if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {

+				$sort_by = implode( '_', $sorting_array );

                 

-                if ( geodir_column_exist( $table, $sort_by ) ) {

-                    $orderby = $table . "." . $sort_by . " " . $order;

-                }

-            }

-        }

-    }

+				if ( geodir_column_exist( $table, $sort_by ) ) {

+					$orderby = $table . "." . $sort_by . " " . $order;

+				}

+			}

+		}

+	}

 

-    return $orderby;

+	return $orderby;

 }
\ No newline at end of file

Spacing +87 added lines, -87 removed lines

@@ -65,7 +65,7 @@ 
  * @global string $s_A Extra parameters.

  * @global string $s_SA Extra parameters.

  */

-function set_listing_request($query )

+function set_listing_request($query)

 {

     global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

@@ -99,15 +99,15 @@ 
         } //  Distance

 

         if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latitude

 

         if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

         if (isset($_REQUEST['snear'])) {

@@ -120,7 +120,7 @@ 
 

         if ($snear == 'NEAR ME') {

             $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));

             $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude]));

             $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude]));

         }

@@ -130,9 +130,9 @@ 
             $s_AA = str_replace(" ", "", $s);

             $s_A = explode(",", $s_AA);

             $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

+            $s_A = '"'.$s_A.'"';

         } else {

-            $s_A = '"' . $s . '"';

+            $s_A = '"'.$s.'"';

         }

 

         if (strstr($s, ' ')) {

@@ -193,7 +193,7 @@ 
     }

     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

@@ -233,7 +233,7 @@ 
     global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

     // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

 	if ($snear != '' || $gd_session->get('all_near_me')) {

         $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

@@ -243,16 +243,16 @@ 
             $mylon = $gd_session->get('user_lon');

         }

 

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+        $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     }

 

     global $s;

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -270,24 +270,24 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                    $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

 					$count++;

                     if ($count < count($keywords)) {

                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." ";

                     } else {

                         //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ";

                     }

                 }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.",";

             }

         } else {

             $gd_titlematch_part = "";

         }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

-		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

+        $s = stripslashes_deep($s);

+        $s = wp_specialchars_decode($s, ENT_QUOTES);

+		$fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));

     }

 

     return $fields;

@@ -316,13 +316,13 @@ 
         $lang_code = ICL_LANGUAGE_CODE;

         $default_lang_code = $sitepress->get_default_language();

         if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+            $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

         }

 

     }

     ########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+    $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID)  ";

     //===old code start

     //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

@@ -391,7 +391,7 @@ 
             $sort_by = 'az';

         }

 

-        if ($snear != '' &&  $sort_by!='farthest') {

+        if ($snear != '' && $sort_by != 'farthest') {

             $sort_by = 'nearest';

         }

     }

@@ -405,20 +405,20 @@ 
             break;

         case 'low_review':

         case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+            $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, ";

             break;

         case 'high_review':

         case 'rating_count_desc':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+            $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

             break;

         case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+            $orderby = "( ".$table.".overall_rating  ) ASC, ".$table.".rating_count ASC,  ";

             break;

         case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'featured':

-            $orderby = $table . ".is_featured asc, ";

+            $orderby = $table.".is_featured asc, ";

             break;

         case 'nearest':

             $orderby = " distance asc, ";

@@ -434,10 +434,10 @@ 
             break;

         // sort by rating

         case 'overall_rating_desc':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'overall_rating_asc':

-            $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

+            $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, ";

             break;

         default:

 

@@ -458,24 +458,24 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

         }

         if ($sort_by == 'nearest' || $sort_by == 'farthest') {

             if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

             } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

             }

         } else {

             if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby;

             } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby;

             }

         }

     }

@@ -490,7 +490,7 @@ 
      */

     $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+    $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

     return $orderby;

 }

@@ -512,7 +512,7 @@ 
 

     global $wpdb;

 

-    if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

+    if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {

 

         $sort_array = explode('_', $sort_by);

 

@@ -522,31 +522,31 @@ 
 

         if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+            $sort_by = str_replace('_'.$order, '', $sort_by);

 

             switch ($sort_by):

 

                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", ";

                     break;

 

                 case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

+                    $orderby = $sort_by." ".$order.", ";

                     break;

 

 

                 // sort by rating

                 case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+                    $orderby = " ".$table.".".$sort_by."  ".$order.", ".$table.".rating_count ".$order.", ";

 

                     break;

 

 

                 default:

                     if (geodir_column_exist($table, $sort_by)) {

-						$orderby = $table . "." . $sort_by . " " . $order . ", ";

+						$orderby = $table.".".$sort_by." ".$order.", ";

 					}

                     break;

 

@@ -594,7 +594,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -665,7 +665,7 @@ 
         $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

         //echo '##########'.$q_post_type;

         if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";

             //$where .= " AND icl_t.language_code = '$lang_code' ";

         }

 

@@ -732,8 +732,8 @@ 
 	}

 

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+    $s = wp_specialchars_decode($s, ENT_QUOTES);

+    $s_A = wp_specialchars_decode($s_A, ENT_QUOTES);

 

     $where = '';

     $better_search_terms = '';

@@ -744,9 +744,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -755,7 +755,7 @@ 
         if (!empty($keywords)) {

             foreach ($keywords as $keyword) {

                 $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

                 if ($keyword != '') {

                     /**

                      * Filter the search query keywords SQL.

@@ -766,7 +766,7 @@ 
                      * @param array $keywords The array of keywords for the query.

                      * @param string $keyword The single keyword being searched.

                      */

-					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

+					$better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);

                 }

             }

         }

@@ -774,10 +774,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+        $taxonomies = "'".$taxonomies."'";

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -788,7 +788,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+		$content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -796,7 +796,7 @@ 
          * @package GeoDirectory

          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+        $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 

     if ($snear != '') {

@@ -831,12 +831,12 @@ 
 							)

 						AND $wpdb->posts.post_type in ('{$post_types}')

 						AND ($wpdb->posts.post_status = 'publish')

-						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

-						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

+						AND ( ".$table.".post_latitude between $rlat1 and $rlat2 )

+						AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) ";

 

         if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

             $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+            $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;

         }

 

     } else {

@@ -857,11 +857,11 @@ 
     }

 

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {

+    if (function_exists('icl_object_id')) {

 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";

         }

     }

     ########### WPML ###########

@@ -884,10 +884,10 @@ 
     global $wpdb, $geodir_post_type, $table, $curr;

 

     $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+    $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0;

 

     if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

@@ -900,7 +900,7 @@ 
         } else

             $where .= " AND $wpdb->posts.post_author = $user_id";

 

-        if ($user_id == (int)get_current_user_id()) {

+        if ($user_id == (int) get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

         } else {

             $where .= " AND $wpdb->posts.post_status = 'publish' ";

@@ -913,7 +913,7 @@ 
     if (function_exists('icl_object_id')) {

         $lang_code = ICL_LANGUAGE_CODE;

         if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

+            $where .= " AND icl_t.language_code='".$lang_code."' ";

         }

 

     }

@@ -936,7 +936,7 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+        $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

     }

     return $join;

 }

@@ -955,16 +955,16 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

+        $where .= " AND ".$table.".is_featured = '1'";

     }

     if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

     }

     if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+        $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id";

     }

     if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

     }

     return $where;

 }

@@ -973,18 +973,18 @@ 
 function geodir_related_posts_fields($fields) {

     global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

     $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

     $mylat = $post->post_latitude;

     $mylon = $post->post_longitude;

 

-    $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+    $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";

     return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

         && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

         && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

     ) {

@@ -1003,25 +1003,25 @@ 
  * @param string $table Listing table name.

  * @return string|null If field exists in table returns order by clause else returns empty.

  */

-function geodir_prepare_custom_sorting( $sorting, $table ) {

+function geodir_prepare_custom_sorting($sorting, $table) {

     $orderby = '';

     

-    if ( empty( $sorting ) || empty( $table ) ) {

+    if (empty($sorting) || empty($table)) {

         return $orderby;

     }

     

-    if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {

-        $sorting_array = explode( '_', $sorting );

+    if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) {

+        $sorting_array = explode('_', $sorting);

         

-        if ( ( $count = count( $sorting_array ) ) > 1 ) {

-            $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : '';

-            array_pop( $sorting_array );

+        if (($count = count($sorting_array)) > 1) {

+            $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : '';

+            array_pop($sorting_array);

             

-            if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {

-                $sort_by = implode( '_', $sorting_array );

+            if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) {

+                $sort_by = implode('_', $sorting_array);

                 

-                if ( geodir_column_exist( $table, $sort_by ) ) {

-                    $orderby = $table . "." . $sort_by . " " . $order;

+                if (geodir_column_exist($table, $sort_by)) {

+                    $orderby = $table.".".$sort_by." ".$order;

                 }

             }

         }

geodirectory-functions/location_functions.php

Braces +31 added lines, -22 removed lines

@@ -61,11 +61,12 @@ 
 function geodir_is_default_location_set()

 {

     $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

-}

+    if (!empty($default_location)) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns location slug using location string.

@@ -259,8 +260,9 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+        if ($geodir_location->is_default) {
+                    update_option('geodir_default_location', $geodir_location);
+        }
 

         return $geodir_location->location_id;

 

@@ -308,9 +310,10 @@ 
     $status = $data->status;

     if ($status == "OK") {

         return $data->results[0]->address_components;

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns current location terms.

@@ -334,16 +337,19 @@ 
         }

 

         $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '' && $country) {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

         $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

         $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '' && $city) {
+                    $location_array['gd_city'] = urldecode($city);
+        }
     } else {

         if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

             return $location_array;

@@ -355,14 +361,17 @@ 
 

         $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '') {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '') {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '') {
+                    $location_array['gd_city'] = urldecode($city);
+        }
 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

Doc Comments +5 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return object

+ * @return string

  */

 function geodir_get_default_location()

 {

@@ -276,7 +276,7 @@ 
  * @package GeoDirectory

  * @param int $min The minimum number. Default: 0.

  * @param int $max The maximum number. Default: 1.

- * @return float

+ * @return integer

  */

 function geodir_random_float($min = 0, $max = 1)

 {

@@ -594,6 +594,9 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

+/**
+ * @param string $sep
+ */
 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

     global $wp;

Indentation +378 added lines, -378 removed lines

@@ -9,10 +9,10 @@ 
  */

 function geodir_get_current_city_lat()

 {

-    $location = geodir_get_default_location();

-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

+	$location = geodir_get_default_location();

+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

 

-    return $lat;

+	return $lat;

 }

 

 /**

@@ -25,9 +25,9 @@ 
  */

 function geodir_get_current_city_lng()

 {

-    $location = geodir_get_default_location();

-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

-    return $lng;

+	$location = geodir_get_default_location();

+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

+	return $lng;

 }

 

 

@@ -40,15 +40,15 @@ 
  */

 function geodir_get_default_location()

 {

-    /**

-     * Filter the default location.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_result The default location object.

-     */

-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

+	/**

+	 * Filter the default location.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_result The default location object.

+	 */

+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

 }

 

 /**

@@ -60,11 +60,11 @@ 
  */

 function geodir_is_default_location_set()

 {

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location))

+		return true;

+	else

+		return false;

 }

 

 /**

@@ -78,15 +78,15 @@ 
 function create_location_slug($location_string)

 {

 

-    /**

-     * Filter the location slug.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_string Sanitized location string.

-     */

-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

+	/**

+	 * Filter the location slug.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_string Sanitized location string.

+	 */

+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

 

 }

 

@@ -100,15 +100,15 @@ 
  */

 function geodir_get_location($id = '')

 {

-    /**

-     * Filter the location information.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $id The location ID.

-     */

-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

+	/**

+	 * Filter the location information.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $id The location ID.

+	 */

+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

 }

 

 /**

@@ -122,28 +122,28 @@ 
  */

 function geodir_get_country_dl($post_country = '', $prefix = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+	$rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

     

-    $ISO2 = array();

-    $countries = array();

+	$ISO2 = array();

+	$countries = array();

     

-    foreach ($rows as $row) {

-        $ISO2[$row->Country] = $row->ISO2;

-        $countries[$row->Country] = __($row->Country, 'geodirectory');

-    }

+	foreach ($rows as $row) {

+		$ISO2[$row->Country] = $row->ISO2;

+		$countries[$row->Country] = __($row->Country, 'geodirectory');

+	}

     

-    asort($countries);

+	asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

-    foreach ($countries as $country => $name) {

-        $ccode = $ISO2[$country];

+	$out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+	foreach ($countries as $country => $name) {

+		$ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

-    }

+		$out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+	}

 

-    echo $out_put;

+	echo $out_put;

 }

 

 

@@ -158,40 +158,40 @@ 
 function geodir_location_form_submit()

 {

 

-    global $wpdb, $plugin_prefix;

-    if (isset($_REQUEST['add_location'])) {

+	global $wpdb, $plugin_prefix;

+	if (isset($_REQUEST['add_location'])) {

 

-        $location_info = array(

-            'city' => $_REQUEST['city'],

-            'region' => $_REQUEST['region'],

-            'country' => $_REQUEST['country'],

-            'geo_lat' => $_REQUEST['latitude'],

-            'geo_lng' => $_REQUEST['longitude'],

-            'is_default' => $_REQUEST['is_default'],

-            'update_city' => $_REQUEST['update_city']

-        );

+		$location_info = array(

+			'city' => $_REQUEST['city'],

+			'region' => $_REQUEST['region'],

+			'country' => $_REQUEST['country'],

+			'geo_lat' => $_REQUEST['latitude'],

+			'geo_lng' => $_REQUEST['longitude'],

+			'is_default' => $_REQUEST['is_default'],

+			'update_city' => $_REQUEST['update_city']

+		);

 

-        $old_location = geodir_get_default_location();

+		$old_location = geodir_get_default_location();

 

-        $locationid = geodir_add_new_location($location_info);

+		$locationid = geodir_add_new_location($location_info);

 

-        $default_location = geodir_get_location($locationid);

+		$default_location = geodir_get_location($locationid);

 

-        //UPDATE AND DELETE LISTING

-        $posttype = geodir_get_posttypes();

-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

+		//UPDATE AND DELETE LISTING

+		$posttype = geodir_get_posttypes();

+		if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

-            foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+			foreach ($posttype as $posttypeobj) {

+				$post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

 

-                $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

-                );

-                $wpdb->query($sql);

-            }

-        }

-    }

+				$sql = $wpdb->prepare(

+					"UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

+				);

+				$wpdb->query($sql);

+			}

+		}

+	}

 }

 

 /**

@@ -215,37 +215,37 @@ 
  */

 function geodir_add_new_location($location_info = array())

 {

-    global $wpdb;

-

-    if (!empty($location_info)) {

-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

-        $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));

-        $region_slug = create_location_slug($location_region);

-        $city_slug = create_location_slug($location_city);

+	global $wpdb;

+

+	if (!empty($location_info)) {

+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

+		$location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));

+		$region_slug = create_location_slug($location_region);

+		$city_slug = create_location_slug($location_city);

         

-        /**

-         * Filter add new location data.

-         *

-         * @since 1.0.0

-         */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

-            'country' => $location_country,

-            'region' => $location_region,

-            'city' => $location_city,

-            'country_slug' => $country_slug,

-            'region_slug' => $region_slug,

-            'city_slug' => $city_slug,

-            'city_latitude' => $location_lat,

-            'city_longitude' => $location_lng,

-            'is_default' => $is_default

-        ));

-

-        /* // Not allowed to create country in DB : 2016-12-09

+		/**

+		 * Filter add new location data.

+		 *

+		 * @since 1.0.0

+		 */

+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+			'country' => $location_country,

+			'region' => $location_region,

+			'city' => $location_city,

+			'country_slug' => $country_slug,

+			'region_slug' => $region_slug,

+			'city_slug' => $city_slug,

+			'city_latitude' => $location_lat,

+			'city_longitude' => $location_lng,

+			'is_default' => $is_default

+		));

+

+		/* // Not allowed to create country in DB : 2016-12-09

         if ($geodir_location->country) {

 

             $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

@@ -259,14 +259,14 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+		if ($geodir_location->is_default)

+			update_option('geodir_default_location', $geodir_location);

 

-        return $geodir_location->location_id;

+		return $geodir_location->location_id;

 

-    } else {

-        return false;

-    }

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -280,7 +280,7 @@ 
  */

 function geodir_random_float($min = 0, $max = 1)

 {

-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);

+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);

 }

 

 /**

@@ -294,22 +294,22 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

-    $status = $data->status;

-    if ($status == "OK") {

-        return $data->results[0]->address_components;

-    } else

-        return false;

+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

+	$status = $data->status;

+	if ($status == "OK") {

+		return $data->results[0]->address_components;

+	} else

+		return false;

 }

 

 /**

@@ -326,70 +326,70 @@ 
  */

 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')

 {

-    global $wp, $gd_session;

-    $location_array = array();

-    if ($location_array_from == 'session') {

-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

-            return $location_array;

-        }

+	global $wp, $gd_session;

+	$location_array = array();

+	if ($location_array_from == 'session') {

+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

+			return $location_array;

+		}

 

-        $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+		$country = $gd_session->get('gd_country');

+		if ($country != '' && $country)

+			$location_array['gd_country'] = urldecode($country);

 

-        $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+		$region = $gd_session->get('gd_region');

+		if ($region != '' && $region)

+			$location_array['gd_region'] = urldecode($region);

 

-        $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

-    } else {

-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

-            return $location_array;

-        }

+		$city = $gd_session->get('gd_city');

+		if ($city != '' && $city)

+			$location_array['gd_city'] = urldecode($city);

+	} else {

+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

+			return $location_array;

+		}

 

-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

 

-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

 

-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+		if ($country != '')

+			$location_array['gd_country'] = urldecode($country);

 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+		if ($region != '')

+			$location_array['gd_region'] = urldecode($region);

 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+		if ($city != '')

+			$location_array['gd_city'] = urldecode($city);

 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

 			$location_array = geodir_get_current_location_terms('session');

 		}

-    }

+	}

 

 	/**

 	 * Filter the location terms.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_array {

+	 *    Attributes of the location_array.

+	 *

+	 *    @type string $gd_country The country slug.

+	 *    @type string $gd_region The region slug.

+	 *    @type string $gd_city The city slug.

 	 *

-     * @param array $location_array {

-     *    Attributes of the location_array.

-     *

-     *    @type string $gd_country The country slug.

-     *    @type string $gd_region The region slug.

-     *    @type string $gd_city The city slug.

-     *

-     * }

+	 * }

 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

 	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

 

-    return $location_array;

+	return $location_array;

 

 }

 

@@ -402,24 +402,24 @@ 
  * @return bool|string

  */

 function geodir_get_location_link($which_location = 'current') {

-    $location_link = get_permalink(geodir_location_page_id());

-

-    if ($which_location == 'base') {

-        return $location_link;

-    } else {

-        $location_terms = geodir_get_current_location_terms();

-

-        if (!empty($location_terms)) {

-            if (get_option('permalink_structure') != '') {

-                $location_terms = implode("/", $location_terms);

-                $location_terms = rtrim($location_terms, '/');

-                $location_link .= $location_terms;

-            } else {

-                $location_link = geodir_getlink($location_link, $location_terms);

-            }

-        }

-    }

-    return $location_link;

+	$location_link = get_permalink(geodir_location_page_id());

+

+	if ($which_location == 'base') {

+		return $location_link;

+	} else {

+		$location_terms = geodir_get_current_location_terms();

+

+		if (!empty($location_terms)) {

+			if (get_option('permalink_structure') != '') {

+				$location_terms = implode("/", $location_terms);

+				$location_terms = rtrim($location_terms, '/');

+				$location_link .= $location_terms;

+			} else {

+				$location_link = geodir_getlink($location_link, $location_terms);

+			}

+		}

+	}

+	return $location_link;

 }

 

 /**

@@ -432,34 +432,34 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

+	$url = is_ssl() ? 'https:' : 'http:';

+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

     

-    if (!empty($data) && !empty($data->address)) {

-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+	if (!empty($data) && !empty($data->address)) {

+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

+		$formatted_address = (array)$data->address;

         

-        foreach ( $data->address as $key => $value ) {

-            if (!in_array($key, $address_fields)) {

-                unset($formatted_address[$key]);

-            }

-        }

-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

+		foreach ( $data->address as $key => $value ) {

+			if (!in_array($key, $address_fields)) {

+				unset($formatted_address[$key]);

+			}

+		}

+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

         

-        return $data;

-    } else {

-        return false;

-    }

+		return $data;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -471,47 +471,47 @@ 
  * @return string Returns the country.

  */

 function geodir_get_normal_country($country) {

-    global $wpdb;

-    if ($result = geodir_get_country_by_name($country)) {

-        return $result;

-    }

+	global $wpdb;

+	if ($result = geodir_get_country_by_name($country)) {

+		return $result;

+	}

     

-    if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

+	if (defined('POST_LOCATION_TABLE')) {

+		$rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

-    }

+		$rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

+	}

     

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

-        return $result;

-    }

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

-        return $result;

-    }

+	if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

-        return $result;

-    }

+	if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -523,16 +523,16 @@ 
  * @return string Country ISO2 code.

  */

 function geodir_get_country_iso2($country) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -545,16 +545,16 @@ 
  * @return string|null Country ISO2 code.

  */

 function geodir_get_country_by_name($country, $iso2 = false) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+		return $result;

+	}

     

-    return NULL;

+	return NULL;

 }

 

 

@@ -574,130 +574,130 @@ 
  */

 function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') {

 

-    if (empty($content)) {

-        return $content;

-    }

+	if (empty($content)) {

+		return $content;

+	}

 

 

-    $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

+	$location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page);

 

-    if (!empty($location_replace_vars)) {

-        foreach ($location_replace_vars as $search => $replace) {

-            if (!empty($search) && strpos($content, $search) !== false) {

-                $content = str_replace($search, $replace, $content);

-            }

-        }

-    }

+	if (!empty($location_replace_vars)) {

+		foreach ($location_replace_vars as $search => $replace) {

+			if (!empty($search) && strpos($content, $search) !== false) {

+				$content = str_replace($search, $replace, $content);

+			}

+		}

+	}

 

-    return $content;

+	return $content;

 }

 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

 function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

 

-    global $wp;

+	global $wp;

     

-    $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

-

-    if (empty($location_array)) {

-        $location_array = geodir_get_current_location_terms('query_vars');

-    }

-

-    $location_terms = array();

-    $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

-    $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

-    $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

-    $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

-

-    $location_names = array();

-    foreach ($location_terms as $type => $location) {

-        $location_name = $location;

-

-        if (!empty($location_name)) {

-            if ($location_manager) {

-                $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                $location_name = get_actual_location_name($location_type, $location, true);

-            } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-            }

-        }

+	$location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

+

+	if (empty($location_array)) {

+		$location_array = geodir_get_current_location_terms('query_vars');

+	}

+

+	$location_terms = array();

+	$location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

+	$location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

+	$location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

+	$location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

+

+	$location_names = array();

+	foreach ($location_terms as $type => $location) {

+		$location_name = $location;

+

+		if (!empty($location_name)) {

+			if ($location_manager) {

+				$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+				$location_name = get_actual_location_name($location_type, $location, true);

+			} else {

+				$location_name = preg_replace( '/-(\d+)$/', '', $location_name);

+				$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+				$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+			}

+		}

 

-        $location_names[$type] = $location_name;

-    }

-

-    $location_single = '';

-    foreach ($location_terms as $type => $location) {

-        if (!empty($location)) {

-            if (!empty($location_names[$type])) {

-                $location_single = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_single = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_single = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

-            break;

-        }

-    }

-

-    $full_location = array();

-    if (!empty($location_array)) {

-        $location_array = array_reverse($location_array);

-

-        foreach ($location_array as $type => $location) {

-            if (!empty($location_names[$type])) {

-                $location_name = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-                    $location_name = get_actual_location_name($location_type, $location, true);

-                } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

-                    $location_name = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

+		$location_names[$type] = $location_name;

+	}

+

+	$location_single = '';

+	foreach ($location_terms as $type => $location) {

+		if (!empty($location)) {

+			if (!empty($location_names[$type])) {

+				$location_single = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_single = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_single = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+			break;

+		}

+	}

+

+	$full_location = array();

+	if (!empty($location_array)) {

+		$location_array = array_reverse($location_array);

+

+		foreach ($location_array as $type => $location) {

+			if (!empty($location_names[$type])) {

+				$location_name = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+					$location_name = get_actual_location_name($location_type, $location, true);

+				} else {

+					$location_name = preg_replace( '/-(\d+)$/', '', $location);

+					$location_name = preg_replace( '/[_-]/', ' ', $location_name );

+					$location_name = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+

+			$full_location[] = $location_name;

+		}

 

-            $full_location[] = $location_name;

-        }

+		if (!empty($full_location)) {

+			$full_location = array_unique($full_location);

+		}

+	}

+	$full_location = !empty($full_location) ? implode(', ', $full_location): '';

 

-        if (!empty($full_location)) {

-            $full_location = array_unique($full_location);

-        }

-    }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

-

-    $location_replace_vars = array();

-    $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

-    $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

-    $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

-

-    foreach ($location_names as $type => $name) {

-        $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

-

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

-    }

-

-    /**

-     * Filter the location terms variables to search & replace.

-     *

-     * @since   1.6.16

-     * @package GeoDirectory

-     *

-     * @param array $location_replace_vars The array of search & replace variables.

-     * @param array $location_array The array of location variables.

-     * @param string $gd_page       The page being filtered.

-     * @param string $sep           The separator.

-     */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+	$location_replace_vars = array();

+	$location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

+	$location_replace_vars['%%location%%'] = $full_location;

+	$location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

+	$location_replace_vars['%%location_single%%'] = $location_single;

+	$location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

+

+	foreach ($location_names as $type => $name) {

+		$location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

+

+		$location_replace_vars['%%location_' . $location_type . '%%'] = $name;

+		$location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

+	}

+

+	/**

+	 * Filter the location terms variables to search & replace.

+	 *

+	 * @since   1.6.16

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_replace_vars The array of search & replace variables.

+	 * @param array $location_array The array of location variables.

+	 * @param string $gd_page       The page being filtered.

+	 * @param string $sep           The separator.

+	 */

+	return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

 }
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -294,7 +294,7 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -387,7 +387,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -433,7 +433,7 @@ 
  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

     $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -447,9 +447,9 @@ 
     

     if (!empty($data) && !empty($data->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+        $formatted_address = (array) $data->address;

         

-        foreach ( $data->address as $key => $value ) {

+        foreach ($data->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

@@ -477,7 +477,7 @@ 
     }

     

     if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -487,7 +487,7 @@ 
             }

         }

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -525,10 +525,10 @@ 
 function geodir_get_country_iso2($country) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

         return $result;

     }

     

@@ -547,10 +547,10 @@ 
 function geodir_get_country_by_name($country, $iso2 = false) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {

         return $result;

     }

     

@@ -594,7 +594,7 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

-function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

+function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') {

 

     global $wp;

     

@@ -619,8 +619,8 @@ 
                 $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                 $location_name = get_actual_location_name($location_type, $location, true);

             } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                $location_name = preg_replace('/-(\d+)$/', '', $location_name);

+                $location_name = preg_replace('/[_-]/', ' ', $location_name);

                 $location_name = __(geodir_ucwords($location_name), 'geodirectory');

             }

         }

@@ -638,8 +638,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_single = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_single = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -659,8 +659,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_name = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_name = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -672,20 +672,20 @@ 
             $full_location = array_unique($full_location);

         }

     }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

+    $full_location = !empty($full_location) ? implode(', ', $full_location) : '';

 

     $location_replace_vars = array();

     $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

     $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

+    $location_replace_vars['%%in_location%%'] = $full_location != '' ? __('in', 'geodirectory').' '.$full_location : '';

     $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

+    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __('in', 'geodirectory').' '.$location_single : '';

 

     foreach ($location_names as $type => $name) {

         $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

 

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

+        $location_replace_vars['%%location_'.$location_type.'%%'] = $name;

+        $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? __('in', 'geodirectory').' '.$name : '';

     }

 

     /**

@@ -699,5 +699,5 @@ 
      * @param string $gd_page       The page being filtered.

      * @param string $sep           The separator.

      */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+    return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep);

 }
\ No newline at end of file