GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/io/Google_CacheParser.php

Indentation +106 added lines, -106 removed lines

@@ -34,20 +34,20 @@ 
    * False if the request is uncacheable.
    */
   public static function isRequestCacheable (Google_HttpRequest $resp) {
-    $method = $resp->getRequestMethod();
-    if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
-      return false;
-    }
-
-    // Don't cache authorized requests/responses.
-    // [rfc2616-14.8] When a shared cache receives a request containing an
-    // Authorization field, it MUST NOT return the corresponding response
-    // as a reply to any other request...
-    if ($resp->getRequestHeader("authorization")) {
-      return false;
-    }
-
-    return true;
+	$method = $resp->getRequestMethod();
+	if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
+	  return false;
+	}
+
+	// Don't cache authorized requests/responses.
+	// [rfc2616-14.8] When a shared cache receives a request containing an
+	// Authorization field, it MUST NOT return the corresponding response
+	// as a reply to any other request...
+	if ($resp->getRequestHeader("authorization")) {
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -59,48 +59,48 @@ 
    * False if the response is un-cacheable.
    */
   public static function isResponseCacheable (Google_HttpRequest $resp) {
-    // First, check if the HTTP request was cacheable before inspecting the
-    // HTTP response.
-    if (false == self::isRequestCacheable($resp)) {
-      return false;
-    }
-
-    $code = $resp->getResponseHttpCode();
-    if (! in_array($code, self::$CACHEABLE_STATUS_CODES)) {
-      return false;
-    }
-
-    // The resource is uncacheable if the resource is already expired and
-    // the resource doesn't have an ETag for revalidation.
-    $etag = $resp->getResponseHeader("etag");
-    if (self::isExpired($resp) && $etag == false) {
-      return false;
-    }
-
-    // [rfc2616-14.9.2]  If [no-store is] sent in a response, a cache MUST NOT
-    // store any part of either this response or the request that elicited it.
-    $cacheControl = $resp->getParsedCacheControl();
-    if (isset($cacheControl['no-store'])) {
-      return false;
-    }
-
-    // Pragma: no-cache is an http request directive, but is occasionally
-    // used as a response header incorrectly.
-    $pragma = $resp->getResponseHeader('pragma');
-    if ($pragma == 'no-cache' || strpos($pragma, 'no-cache') !== false) {
-      return false;
-    }
-
-    // [rfc2616-14.44] Vary: * is extremely difficult to cache. "It implies that
-    // a cache cannot determine from the request headers of a subsequent request
-    // whether this response is the appropriate representation."
-    // Given this, we deem responses with the Vary header as uncacheable.
-    $vary = $resp->getResponseHeader('vary');
-    if ($vary) {
-      return false;
-    }
-
-    return true;
+	// First, check if the HTTP request was cacheable before inspecting the
+	// HTTP response.
+	if (false == self::isRequestCacheable($resp)) {
+	  return false;
+	}
+
+	$code = $resp->getResponseHttpCode();
+	if (! in_array($code, self::$CACHEABLE_STATUS_CODES)) {
+	  return false;
+	}
+
+	// The resource is uncacheable if the resource is already expired and
+	// the resource doesn't have an ETag for revalidation.
+	$etag = $resp->getResponseHeader("etag");
+	if (self::isExpired($resp) && $etag == false) {
+	  return false;
+	}
+
+	// [rfc2616-14.9.2]  If [no-store is] sent in a response, a cache MUST NOT
+	// store any part of either this response or the request that elicited it.
+	$cacheControl = $resp->getParsedCacheControl();
+	if (isset($cacheControl['no-store'])) {
+	  return false;
+	}
+
+	// Pragma: no-cache is an http request directive, but is occasionally
+	// used as a response header incorrectly.
+	$pragma = $resp->getResponseHeader('pragma');
+	if ($pragma == 'no-cache' || strpos($pragma, 'no-cache') !== false) {
+	  return false;
+	}
+
+	// [rfc2616-14.44] Vary: * is extremely difficult to cache. "It implies that
+	// a cache cannot determine from the request headers of a subsequent request
+	// whether this response is the appropriate representation."
+	// Given this, we deem responses with the Vary header as uncacheable.
+	$vary = $resp->getResponseHeader('vary');
+	if ($vary) {
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -110,52 +110,52 @@ 
    * False if it is considered to be fresh.
    */
   public static function isExpired(Google_HttpRequest $resp) {
-    // HTTP/1.1 clients and caches MUST treat other invalid date formats,
-    // especially including the value “0”, as in the past.
-    $parsedExpires = false;
-    $responseHeaders = $resp->getResponseHeaders();
-    if (isset($responseHeaders['expires'])) {
-      $rawExpires = $responseHeaders['expires'];
-      // Check for a malformed expires header first.
-      if (empty($rawExpires) || (is_numeric($rawExpires) && $rawExpires <= 0)) {
-        return true;
-      }
-
-      // See if we can parse the expires header.
-      $parsedExpires = strtotime($rawExpires);
-      if (false == $parsedExpires || $parsedExpires <= 0) {
-        return true;
-      }
-    }
-
-    // Calculate the freshness of an http response.
-    $freshnessLifetime = false;
-    $cacheControl = $resp->getParsedCacheControl();
-    if (isset($cacheControl['max-age'])) {
-      $freshnessLifetime = $cacheControl['max-age'];
-    }
-
-    $rawDate = $resp->getResponseHeader('date');
-    $parsedDate = strtotime($rawDate);
-
-    if (empty($rawDate) || false == $parsedDate) {
-      $parsedDate = time();
-    }
-    if (false == $freshnessLifetime && isset($responseHeaders['expires'])) {
-      $freshnessLifetime = $parsedExpires - $parsedDate;
-    }
-
-    if (false == $freshnessLifetime) {
-      return true;
-    }
-
-    // Calculate the age of an http response.
-    $age = max(0, time() - $parsedDate);
-    if (isset($responseHeaders['age'])) {
-      $age = max($age, strtotime($responseHeaders['age']));
-    }
-
-    return $freshnessLifetime <= $age;
+	// HTTP/1.1 clients and caches MUST treat other invalid date formats,
+	// especially including the value “0”, as in the past.
+	$parsedExpires = false;
+	$responseHeaders = $resp->getResponseHeaders();
+	if (isset($responseHeaders['expires'])) {
+	  $rawExpires = $responseHeaders['expires'];
+	  // Check for a malformed expires header first.
+	  if (empty($rawExpires) || (is_numeric($rawExpires) && $rawExpires <= 0)) {
+		return true;
+	  }
+
+	  // See if we can parse the expires header.
+	  $parsedExpires = strtotime($rawExpires);
+	  if (false == $parsedExpires || $parsedExpires <= 0) {
+		return true;
+	  }
+	}
+
+	// Calculate the freshness of an http response.
+	$freshnessLifetime = false;
+	$cacheControl = $resp->getParsedCacheControl();
+	if (isset($cacheControl['max-age'])) {
+	  $freshnessLifetime = $cacheControl['max-age'];
+	}
+
+	$rawDate = $resp->getResponseHeader('date');
+	$parsedDate = strtotime($rawDate);
+
+	if (empty($rawDate) || false == $parsedDate) {
+	  $parsedDate = time();
+	}
+	if (false == $freshnessLifetime && isset($responseHeaders['expires'])) {
+	  $freshnessLifetime = $parsedExpires - $parsedDate;
+	}
+
+	if (false == $freshnessLifetime) {
+	  return true;
+	}
+
+	// Calculate the age of an http response.
+	$age = max(0, time() - $parsedDate);
+	if (isset($responseHeaders['age'])) {
+	  $age = max($age, strtotime($responseHeaders['age']));
+	}
+
+	return $freshnessLifetime <= $age;
   }
 
   /**
@@ -165,9 +165,9 @@ 
    * @return bool True if the entry is expired, else return false.
    */
   public static function mustRevalidate(Google_HttpRequest $response) {
-    // [13.3] When a cache has a stale entry that it would like to use as a
-    // response to a client's request, it first has to check with the origin
-    // server to see if its cached entry is still usable.
-    return self::isExpired($response);
+	// [13.3] When a cache has a stale entry that it would like to use as a
+	// response to a client's request, it first has to check with the origin
+	// server to see if its cached entry is still usable.
+	return self::isExpired($response);
   }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -33,9 +33,9 @@ 
    * @return bool True if the request is cacheable.
    * False if the request is uncacheable.
    */
-  public static function isRequestCacheable (Google_HttpRequest $resp) {
+  public static function isRequestCacheable(Google_HttpRequest $resp) {
     $method = $resp->getRequestMethod();
-    if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
+    if (!in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
       return false;
     }
 
@@ -58,7 +58,7 @@ 
    * @return bool True if the response is cacheable.
    * False if the response is un-cacheable.
    */
-  public static function isResponseCacheable (Google_HttpRequest $resp) {
+  public static function isResponseCacheable(Google_HttpRequest $resp) {
     // First, check if the HTTP request was cacheable before inspecting the
     // HTTP response.
     if (false == self::isRequestCacheable($resp)) {
@@ -66,7 +66,7 @@ 
     }
 
     $code = $resp->getResponseHttpCode();
-    if (! in_array($code, self::$CACHEABLE_STATUS_CODES)) {
+    if (!in_array($code, self::$CACHEABLE_STATUS_CODES)) {
       return false;
     }
 

geodirectory-admin/google-api-php-client/src/service/Google_BatchRequest.php

Indentation +65 added lines, -65 removed lines

@@ -26,85 +26,85 @@
   private $requests = array();
 
   public function __construct($boundary = false) {
-    $boundary = (false == $boundary) ? mt_rand() : $boundary;
-    $this->boundary = str_replace('"', '', $boundary);
+	$boundary = (false == $boundary) ? mt_rand() : $boundary;
+	$this->boundary = str_replace('"', '', $boundary);
   }
 
   public function add(Google_HttpRequest $request, $key = false) {
-    if (false == $key) {
-      $key = mt_rand();
-    }
+	if (false == $key) {
+	  $key = mt_rand();
+	}
 
-    $this->requests[$key] = $request;
+	$this->requests[$key] = $request;
   }
 
   public function execute() {
-    $body = '';
+	$body = '';
 
-    /** @var Google_HttpRequest $req */
-    foreach($this->requests as $key => $req) {
-      $body .= "--{$this->boundary}\n";
-      $body .= $req->toBatchString($key) . "\n";
-    }
+	/** @var Google_HttpRequest $req */
+	foreach($this->requests as $key => $req) {
+	  $body .= "--{$this->boundary}\n";
+	  $body .= $req->toBatchString($key) . "\n";
+	}
 
-    $body = rtrim($body);
-    $body .= "\n--{$this->boundary}--";
+	$body = rtrim($body);
+	$body .= "\n--{$this->boundary}--";
 
-    global $apiConfig;
-    $url = $apiConfig['basePath'] . '/batch';
-    $httpRequest = new Google_HttpRequest($url, 'POST');
-    $httpRequest->setRequestHeaders(array(
-        'Content-Type' => 'multipart/mixed; boundary=' . $this->boundary));
+	global $apiConfig;
+	$url = $apiConfig['basePath'] . '/batch';
+	$httpRequest = new Google_HttpRequest($url, 'POST');
+	$httpRequest->setRequestHeaders(array(
+		'Content-Type' => 'multipart/mixed; boundary=' . $this->boundary));
 
-    $httpRequest->setPostBody($body);
-    $response = Google_Client::$io->makeRequest($httpRequest);
+	$httpRequest->setPostBody($body);
+	$response = Google_Client::$io->makeRequest($httpRequest);
 
-    $response = $this->parseResponse($response);
-    return $response;
+	$response = $this->parseResponse($response);
+	return $response;
   }
 
   public function parseResponse(Google_HttpRequest $response) {
-    $contentType = $response->getResponseHeader('content-type');
-    $contentType = explode(';', $contentType);
-    $boundary = false;
-    foreach($contentType as $part) {
-      $part = (explode('=', $part, 2));
-      if (isset($part[0]) && 'boundary' == trim($part[0])) {
-        $boundary = $part[1];
-      }
-    }
-
-    $body = $response->getResponseBody();
-    if ($body) {
-      $body = str_replace("--$boundary--", "--$boundary", $body);
-      $parts = explode("--$boundary", $body);
-      $responses = array();
-
-      foreach($parts as $part) {
-        $part = trim($part);
-        if (!empty($part)) {
-          list($metaHeaders, $part) = explode("\r\n\r\n", $part, 2);
-          $metaHeaders = Google_CurlIO::parseResponseHeaders($metaHeaders);
-
-          $status = substr($part, 0, strpos($part, "\n"));
-          $status = explode(" ", $status);
-          $status = $status[1];
-
-          list($partHeaders, $partBody) = Google_CurlIO::parseHttpResponse($part, false);
-          $response = new Google_HttpRequest("");
-          $response->setResponseHttpCode($status);
-          $response->setResponseHeaders($partHeaders);
-          $response->setResponseBody($partBody);
-          $response = Google_REST::decodeHttpResponse($response);
-
-          // Need content id.
-          $responses[$metaHeaders['content-id']] = $response;
-        }
-      }
-
-      return $responses;
-    }
-
-    return null;
+	$contentType = $response->getResponseHeader('content-type');
+	$contentType = explode(';', $contentType);
+	$boundary = false;
+	foreach($contentType as $part) {
+	  $part = (explode('=', $part, 2));
+	  if (isset($part[0]) && 'boundary' == trim($part[0])) {
+		$boundary = $part[1];
+	  }
+	}
+
+	$body = $response->getResponseBody();
+	if ($body) {
+	  $body = str_replace("--$boundary--", "--$boundary", $body);
+	  $parts = explode("--$boundary", $body);
+	  $responses = array();
+
+	  foreach($parts as $part) {
+		$part = trim($part);
+		if (!empty($part)) {
+		  list($metaHeaders, $part) = explode("\r\n\r\n", $part, 2);
+		  $metaHeaders = Google_CurlIO::parseResponseHeaders($metaHeaders);
+
+		  $status = substr($part, 0, strpos($part, "\n"));
+		  $status = explode(" ", $status);
+		  $status = $status[1];
+
+		  list($partHeaders, $partBody) = Google_CurlIO::parseHttpResponse($part, false);
+		  $response = new Google_HttpRequest("");
+		  $response->setResponseHttpCode($status);
+		  $response->setResponseHeaders($partHeaders);
+		  $response->setResponseBody($partBody);
+		  $response = Google_REST::decodeHttpResponse($response);
+
+		  // Need content id.
+		  $responses[$metaHeaders['content-id']] = $response;
+		}
+	  }
+
+	  return $responses;
+	}
+
+	return null;
   }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -42,19 +42,19 @@ 
     $body = '';
 
     /** @var Google_HttpRequest $req */
-    foreach($this->requests as $key => $req) {
+    foreach ($this->requests as $key => $req) {
       $body .= "--{$this->boundary}\n";
-      $body .= $req->toBatchString($key) . "\n";
+      $body .= $req->toBatchString($key)."\n";
     }
 
     $body = rtrim($body);
     $body .= "\n--{$this->boundary}--";
 
     global $apiConfig;
-    $url = $apiConfig['basePath'] . '/batch';
+    $url = $apiConfig['basePath'].'/batch';
     $httpRequest = new Google_HttpRequest($url, 'POST');
     $httpRequest->setRequestHeaders(array(
-        'Content-Type' => 'multipart/mixed; boundary=' . $this->boundary));
+        'Content-Type' => 'multipart/mixed; boundary='.$this->boundary));
 
     $httpRequest->setPostBody($body);
     $response = Google_Client::$io->makeRequest($httpRequest);
@@ -67,7 +67,7 @@ 
     $contentType = $response->getResponseHeader('content-type');
     $contentType = explode(';', $contentType);
     $boundary = false;
-    foreach($contentType as $part) {
+    foreach ($contentType as $part) {
       $part = (explode('=', $part, 2));
       if (isset($part[0]) && 'boundary' == trim($part[0])) {
         $boundary = $part[1];
@@ -80,7 +80,7 @@ 
       $parts = explode("--$boundary", $body);
       $responses = array();
 
-      foreach($parts as $part) {
+      foreach ($parts as $part) {
         $part = trim($part);
         if (!empty($part)) {
           list($metaHeaders, $part) = explode("\r\n\r\n", $part, 2);

geodirectory-admin/dummy-data/property_sale.php

Indentation +676 added lines, -676 removed lines

@@ -7,256 +7,256 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // price
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Price', 'geodirectory'),
-                      'site_title'          =>  __('Price', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
-                      'htmlvar_name'        =>  'price',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-usd',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-    // property status
-    $fields[] = array('listing_type' => $post_type,
-                      'data_type' => 'VARCHAR',
-                      'field_type' => 'select',
-                      'field_type_key' => 'property_status',
-                      'is_active' => 1,
-                      'for_admin_use' => 0,
-                      'is_default' => 0,
-                      'admin_title' => __('Property Status', 'geodirectory'),
-                      'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
-                      'site_title' => __('Property Status', 'geodirectory'),
-                      'htmlvar_name' => 'property_status',
-                      'default_value' => '',
-                      'is_required' => '1',
-                      'required_msg' => '',
-                      'show_in'   =>  '[detail],[listing]',
-                      'show_on_pkg' => $package,
-                      'option_values' => 'Select Status/,For Sale,Sold,Under Offer',
-                      'field_icon' => 'fa fa-home',
-                      'css_class' => '',
-                      'cat_sort' => 1,
-                      'cat_filter' => 1,
-    );
-
-    // property furnishing
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Furnishing', 'geodirectory'),
-                      'site_title'          =>  __('Furnishing', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_furnishing',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-th-large',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Type', 'geodirectory'),
-                      'site_title'          =>  __('Property Type', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-home',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bedrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bedrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bedrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-bed',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bathrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bathrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bathrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-bold',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property area
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'admin_title'         =>  __('Property Area', 'geodirectory'),
-                      'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-area-chart',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property features
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'multiselect',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Features', 'geodirectory'),
-                      'site_title'          =>  __('Features', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_features',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-plus-square',
-                      'css_class'           =>  'gd-comma-list',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// price
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Price', 'geodirectory'),
+					  'site_title'          =>  __('Price', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the price in $ (no currency symbol)', 'geodirectory'),
+					  'htmlvar_name'        =>  'price',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-usd',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+	// property status
+	$fields[] = array('listing_type' => $post_type,
+					  'data_type' => 'VARCHAR',
+					  'field_type' => 'select',
+					  'field_type_key' => 'property_status',
+					  'is_active' => 1,
+					  'for_admin_use' => 0,
+					  'is_default' => 0,
+					  'admin_title' => __('Property Status', 'geodirectory'),
+					  'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
+					  'site_title' => __('Property Status', 'geodirectory'),
+					  'htmlvar_name' => 'property_status',
+					  'default_value' => '',
+					  'is_required' => '1',
+					  'required_msg' => '',
+					  'show_in'   =>  '[detail],[listing]',
+					  'show_on_pkg' => $package,
+					  'option_values' => 'Select Status/,For Sale,Sold,Under Offer',
+					  'field_icon' => 'fa fa-home',
+					  'css_class' => '',
+					  'cat_sort' => 1,
+					  'cat_filter' => 1,
+	);
+
+	// property furnishing
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Furnishing', 'geodirectory'),
+					  'site_title'          =>  __('Furnishing', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_furnishing',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-th-large',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Type', 'geodirectory'),
+					  'site_title'          =>  __('Property Type', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-home',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bedrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bedrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bedrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-bed',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bathrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bathrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bathrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-bold',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property area
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'admin_title'         =>  __('Property Area', 'geodirectory'),
+					  'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-area-chart',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property features
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'multiselect',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Features', 'geodirectory'),
+					  'site_title'          =>  __('Features', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_features',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-plus-square',
+					  'css_class'           =>  'gd-comma-list',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 function geodir_property_sale_custom_fields_advanced_search($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // price range
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => 'RANGE',
-        'is_active'               => 1,
-        'site_field_title'        => 'Price',
-        'field_data_type'         => 'FLOAT',
-        'main_search'             => 1,
-        'main_search_priority'    => 15,
-        'data_type_change'        => 'SELECT',
-        'search_condition_select' => 'SINGLE',
-        'search_min_value'        => '50000',
-        'search_max_value'        => '1000000',
-        'search_diff_value'       => '100000',
-        'first_search_value'      => '0',
-        'first_search_text'       => '',
-        'last_search_text'        => '',
-        'search_condition'        => 'SELECT',
-        'site_htmlvar_name'       => 'geodir_price',
-        'htmlvar_name'            => 'geodir_price',
-        'field_title'             => 'geodir_price',
-        'expand_custom_value'     => '',
-        'front_search_title'      => 'Price Range',
-        'field_desc'              => ''
-    );
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// price range
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => 'RANGE',
+		'is_active'               => 1,
+		'site_field_title'        => 'Price',
+		'field_data_type'         => 'FLOAT',
+		'main_search'             => 1,
+		'main_search_priority'    => 15,
+		'data_type_change'        => 'SELECT',
+		'search_condition_select' => 'SINGLE',
+		'search_min_value'        => '50000',
+		'search_max_value'        => '1000000',
+		'search_diff_value'       => '100000',
+		'first_search_value'      => '0',
+		'first_search_text'       => '',
+		'last_search_text'        => '',
+		'search_condition'        => 'SELECT',
+		'site_htmlvar_name'       => 'geodir_price',
+		'htmlvar_name'            => 'geodir_price',
+		'field_title'             => 'geodir_price',
+		'expand_custom_value'     => '',
+		'front_search_title'      => 'Price Range',
+		'field_desc'              => ''
+	);
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields_advanced_search', $fields);
+
+	return $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -266,46 +266,46 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
-
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-
-    // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_sale');
-
-    // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
-        $search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
-        }
-    }
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
+
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+
+	// update the type currently installed
+	update_option($post_type.'_dummy_data_type','property_sale');
+
+	// add the advanced search fields
+	if (defined('GEODIRADVANCESEARCH_VERSION')){
+		$search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
+		foreach($search_fields as $sfield){
+			geodir_custom_advance_search_field_save( $sfield );
+		}
+	}
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -314,42 +314,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -359,42 +359,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -404,43 +404,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -450,42 +450,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -495,42 +495,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -540,42 +540,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -585,42 +585,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -630,43 +630,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -676,39 +676,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -718,93 +718,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

Spacing +16 added lines, -16 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') {
     $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
+    $package = ($package_id == '') ? '' : array($package_id);
 
     // price
     $fields[] = array('listing_type' => $post_type,
@@ -78,7 +78,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -101,7 +101,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -124,7 +124,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -147,7 +147,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -192,7 +192,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -215,7 +215,7 @@ 
     return  $fields;
 }
 
-function geodir_property_sale_custom_fields_advanced_search($post_type='gd_place') {
+function geodir_property_sale_custom_fields_advanced_search($post_type = 'gd_place') {
 
 
     $fields = array();
@@ -259,34 +259,34 @@ 
     return $fields;
 }
 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
 $post_info = array();
 $image_array = array();
 $post_meta = array();
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
-if($dummy_post_index==1){
+if ($dummy_post_index == 1) {
     // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+    geodir_dummy_data_taxonomies($post_type, $category_array);
 
     // add the dummy custom fields
     $fields = geodir_property_sale_custom_fields($post_type);
     geodir_create_dummy_fields($fields);
 
     // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_sale');
+    update_option($post_type.'_dummy_data_type', 'property_sale');
 
     // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
+    if (defined('GEODIRADVANCESEARCH_VERSION')) {
         $search_fields = geodir_property_sale_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
+        foreach ($search_fields as $sfield) {
+            geodir_custom_advance_search_field_save($sfield);
         }
     }
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
 else
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 

geodirectory-admin/dummy-data/property_rent.php

Indentation +791 added lines, -791 removed lines

@@ -7,371 +7,371 @@ 
  */
 
 function geodir_property_rent_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // price
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Price', 'geodirectory'),
-                      'site_title'          =>  __('Price', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the price per calendar month (PCM)in $ (no currency symbol)', 'geodirectory'),
-                      'htmlvar_name'        =>  'price',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-usd',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-    // property status
-    $fields[] = array('listing_type' => $post_type,
-                      'data_type' => 'VARCHAR',
-                      'field_type' => 'select',
-                      'field_type_key' => 'property_status',
-                      'is_active' => 1,
-                      'for_admin_use' => 0,
-                      'is_default' => 0,
-                      'admin_title' => __('Property Status', 'geodirectory'),
-                      'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
-                      'site_title' => __('Property Status', 'geodirectory'),
-                      'htmlvar_name' => 'property_status',
-                      'default_value' => '',
-                      'is_required' => '1',
-                      'required_msg' => '',
-                      'show_in'   =>  '[detail],[listing]',
-                      'show_on_pkg' => $package,
-                      'option_values' => 'Select Status/,For Rent,Let,Under Offer',
-                      'field_icon' => 'fa fa-home',
-                      'css_class' => '',
-                      'cat_sort' => 1,
-                      'cat_filter' => 1,
-    );
-
-    // property furnishing
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Furnishing', 'geodirectory'),
-                      'site_title'          =>  __('Furnishing', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_furnishing',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-th-large',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Type', 'geodirectory'),
-                      'site_title'          =>  __('Property Type', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-home',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bedrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bedrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bedrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-bed',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property bathrooms
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
-                      'site_title'          =>  __('Bathrooms', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_bathrooms',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-bold',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property area
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'admin_title'         =>  __('Property Area', 'geodirectory'),
-                      'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-area-chart',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // property features
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'multiselect',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Property Features', 'geodirectory'),
-                      'site_title'          =>  __('Features', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_features',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-plus-square',
-                      'css_class'           =>  'gd-comma-list',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_rent_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// price
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Price', 'geodirectory'),
+					  'site_title'          =>  __('Price', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the price per calendar month (PCM)in $ (no currency symbol)', 'geodirectory'),
+					  'htmlvar_name'        =>  'price',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-usd',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+	// property status
+	$fields[] = array('listing_type' => $post_type,
+					  'data_type' => 'VARCHAR',
+					  'field_type' => 'select',
+					  'field_type_key' => 'property_status',
+					  'is_active' => 1,
+					  'for_admin_use' => 0,
+					  'is_default' => 0,
+					  'admin_title' => __('Property Status', 'geodirectory'),
+					  'admin_desc' => __('Enter the status of the property.', 'geodirectory'),
+					  'site_title' => __('Property Status', 'geodirectory'),
+					  'htmlvar_name' => 'property_status',
+					  'default_value' => '',
+					  'is_required' => '1',
+					  'required_msg' => '',
+					  'show_in'   =>  '[detail],[listing]',
+					  'show_on_pkg' => $package,
+					  'option_values' => 'Select Status/,For Rent,Let,Under Offer',
+					  'field_icon' => 'fa fa-home',
+					  'css_class' => '',
+					  'cat_sort' => 1,
+					  'cat_filter' => 1,
+	);
+
+	// property furnishing
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Furnishing', 'geodirectory'),
+					  'site_title'          =>  __('Furnishing', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the furnishing status of the property.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_furnishing',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-th-large',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Type', 'geodirectory'),
+					  'site_title'          =>  __('Property Type', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property type.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-home',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bedrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bedrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bedrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bedrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bedrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-bed',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property bathrooms
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Bathrooms', 'geodirectory'),
+					  'site_title'          =>  __('Bathrooms', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of bathrooms', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_bathrooms',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-bold',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property area
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'admin_title'         =>  __('Property Area', 'geodirectory'),
+					  'site_title'          =>  __('Area (Sq Ft)', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Sq Ft value for the property', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-area-chart',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// property features
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'multiselect',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Property Features', 'geodirectory'),
+					  'site_title'          =>  __('Features', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the property features.', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_features',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-plus-square',
+					  'css_class'           =>  'gd-comma-list',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_rent_custom_fields', $fields);
+
+	return  $fields;
 }
 
 function geodir_property_rent_custom_fields_advanced_search($post_type='gd_place') {
 
 
-    $fields = array();
-
-    // Price range
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'text',
-        'data_type'               => 'RANGE',
-        'is_active'               => 1,
-        'site_field_title'        => 'Price',
-        'field_data_type'         => 'FLOAT',
-        'main_search'             => 1,
-        'main_search_priority'    => 15,
-        'data_type_change'        => 'SELECT',
-        'search_condition_select' => 'SINGLE',
-        'search_min_value'        => '1000',
-        'search_max_value'        => '10000',
-        'search_diff_value'       => '1000',
-        'first_search_value'      => '0',
-        'first_search_text'       => '',
-        'last_search_text'        => '',
-        'search_condition'        => 'SELECT',
-        'site_htmlvar_name'       => 'geodir_price',
-        'htmlvar_name'            => 'geodir_price',
-        'field_title'             => 'geodir_price',
-        'expand_custom_value'     => '',
-        'front_search_title'      => 'Price Range pm',
-        'field_desc'              => ''
-    );
-
-    // bedrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bedrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 1,
-        'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bedrooms',
-        'htmlvar_name'            => 'geodir_property_bedrooms',
-        'field_title'             => 'geodir_property_bedrooms',
-        'front_search_title'      => 'Bedrooms',
-        'field_desc'              => ''
-    );
-
-    // Property type
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Type',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_type',
-        'htmlvar_name'            => 'geodir_property_type',
-        'field_title'             => 'geodir_property_type',
-        'front_search_title'      => 'Property Type',
-        'field_desc'              => ''
-    );
-
-    // Property Bathrooms
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Bathrooms',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_bathrooms',
-        'htmlvar_name'            => 'geodir_property_bathrooms',
-        'field_title'             => 'geodir_property_bathrooms',
-        'front_search_title'      => 'Bathrooms',
-        'field_desc'              => ''
-    );
-
-    // Property Furnishing
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Furnishing',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_furnishing',
-        'htmlvar_name'            => 'geodir_property_furnishing',
-        'field_title'             => 'geodir_property_furnishing',
-        'front_search_title'      => 'Furnishing',
-        'field_desc'              => ''
-    );
-
-    // Property Status
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Status',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_status',
-        'htmlvar_name'            => 'geodir_property_status',
-        'field_title'             => 'geodir_property_status',
-        'front_search_title'      => 'Property Status',
-        'field_desc'              => ''
-    );
-
-    // Property Status
-    $fields[] = array(
-        'create_field'            => true,
-        'listing_type'            => $post_type,
-        'field_type'              => 'select',
-        'data_type'               => 'SELECT',
-        'is_active'               => 1,
-        'site_field_title'        => 'Property Status',
-        'field_data_type'         => 'VARCHAR',
-        'main_search'             => 0,
-        //'main_search_priority'    => 16,
-        'search_condition'        => 'SINGLE',
-        'site_htmlvar_name'       => 'geodir_property_status',
-        'htmlvar_name'            => 'geodir_property_status',
-        'field_title'             => 'geodir_property_status',
-        'front_search_title'      => 'Property Status',
-        'field_desc'              => ''
-    );
-
-
-    /**
-     * Filter the array of advanced search fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_rent_custom_fields_advanced_search', $fields);
-
-    return $fields;
+	$fields = array();
+
+	// Price range
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'text',
+		'data_type'               => 'RANGE',
+		'is_active'               => 1,
+		'site_field_title'        => 'Price',
+		'field_data_type'         => 'FLOAT',
+		'main_search'             => 1,
+		'main_search_priority'    => 15,
+		'data_type_change'        => 'SELECT',
+		'search_condition_select' => 'SINGLE',
+		'search_min_value'        => '1000',
+		'search_max_value'        => '10000',
+		'search_diff_value'       => '1000',
+		'first_search_value'      => '0',
+		'first_search_text'       => '',
+		'last_search_text'        => '',
+		'search_condition'        => 'SELECT',
+		'site_htmlvar_name'       => 'geodir_price',
+		'htmlvar_name'            => 'geodir_price',
+		'field_title'             => 'geodir_price',
+		'expand_custom_value'     => '',
+		'front_search_title'      => 'Price Range pm',
+		'field_desc'              => ''
+	);
+
+	// bedrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bedrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 1,
+		'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bedrooms',
+		'htmlvar_name'            => 'geodir_property_bedrooms',
+		'field_title'             => 'geodir_property_bedrooms',
+		'front_search_title'      => 'Bedrooms',
+		'field_desc'              => ''
+	);
+
+	// Property type
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Type',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_type',
+		'htmlvar_name'            => 'geodir_property_type',
+		'field_title'             => 'geodir_property_type',
+		'front_search_title'      => 'Property Type',
+		'field_desc'              => ''
+	);
+
+	// Property Bathrooms
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Bathrooms',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_bathrooms',
+		'htmlvar_name'            => 'geodir_property_bathrooms',
+		'field_title'             => 'geodir_property_bathrooms',
+		'front_search_title'      => 'Bathrooms',
+		'field_desc'              => ''
+	);
+
+	// Property Furnishing
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Furnishing',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_furnishing',
+		'htmlvar_name'            => 'geodir_property_furnishing',
+		'field_title'             => 'geodir_property_furnishing',
+		'front_search_title'      => 'Furnishing',
+		'field_desc'              => ''
+	);
+
+	// Property Status
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Status',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_status',
+		'htmlvar_name'            => 'geodir_property_status',
+		'field_title'             => 'geodir_property_status',
+		'front_search_title'      => 'Property Status',
+		'field_desc'              => ''
+	);
+
+	// Property Status
+	$fields[] = array(
+		'create_field'            => true,
+		'listing_type'            => $post_type,
+		'field_type'              => 'select',
+		'data_type'               => 'SELECT',
+		'is_active'               => 1,
+		'site_field_title'        => 'Property Status',
+		'field_data_type'         => 'VARCHAR',
+		'main_search'             => 0,
+		//'main_search_priority'    => 16,
+		'search_condition'        => 'SINGLE',
+		'site_htmlvar_name'       => 'geodir_property_status',
+		'htmlvar_name'            => 'geodir_property_status',
+		'field_title'             => 'geodir_property_status',
+		'front_search_title'      => 'Property Status',
+		'field_desc'              => ''
+	);
+
+
+	/**
+	 * Filter the array of advanced search fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_rent_custom_fields_advanced_search', $fields);
+
+	return $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -381,46 +381,46 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
-
-    // add the dummy custom fields
-    $fields = geodir_property_rent_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-
-    // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_rent');
-
-    // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
-        $search_fields = geodir_property_rent_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
-        }
-    }
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
+
+	// add the dummy custom fields
+	$fields = geodir_property_rent_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+
+	// update the type currently installed
+	update_option($post_type.'_dummy_data_type','property_rent');
+
+	// add the advanced search fields
+	if (defined('GEODIRADVANCESEARCH_VERSION')){
+		$search_fields = geodir_property_rent_custom_fields_advanced_search($post_type);
+		foreach($search_fields as $sfield){
+			geodir_custom_advance_search_field_save( $sfield );
+		}
+	}
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -429,42 +429,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1750',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1750',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -474,42 +474,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1150',
-            "geodir_property_status" => 'Let',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1150',
+			"geodir_property_status" => 'Let',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -519,43 +519,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1300',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1300',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -565,42 +565,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '13000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '13000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -610,42 +610,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1800',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1800',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -655,42 +655,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2700',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2700',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -700,42 +700,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '1450',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '1450',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -745,43 +745,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2000',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2000',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -791,39 +791,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '60000',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '60000',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -833,93 +833,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '800',
-            "geodir_property_status" => 'For Rent',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '800',
+			"geodir_property_status" => 'For Rent',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

Spacing +16 added lines, -16 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_rent_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_rent_custom_fields($post_type = 'gd_place', $package_id = '') {
     $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
+    $package = ($package_id == '') ? '' : array($package_id);
 
     // price
     $fields[] = array('listing_type' => $post_type,
@@ -78,7 +78,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+                      'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -101,7 +101,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land','geodirectory'),
+                      'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage,Hotel,Land', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -124,7 +124,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -147,7 +147,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+                      'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -192,7 +192,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+                      'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -215,7 +215,7 @@ 
     return  $fields;
 }
 
-function geodir_property_rent_custom_fields_advanced_search($post_type='gd_place') {
+function geodir_property_rent_custom_fields_advanced_search($post_type = 'gd_place') {
 
 
     $fields = array();
@@ -374,34 +374,34 @@ 
     return $fields;
 }
 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
 $post_info = array();
 $image_array = array();
 $post_meta = array();
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
-if($dummy_post_index==1){
+if ($dummy_post_index == 1) {
     // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+    geodir_dummy_data_taxonomies($post_type, $category_array);
 
     // add the dummy custom fields
     $fields = geodir_property_rent_custom_fields($post_type);
     geodir_create_dummy_fields($fields);
 
     // update the type currently installed
-    update_option($post_type.'_dummy_data_type','property_rent');
+    update_option($post_type.'_dummy_data_type', 'property_rent');
 
     // add the advanced search fields
-    if (defined('GEODIRADVANCESEARCH_VERSION')){
+    if (defined('GEODIRADVANCESEARCH_VERSION')) {
         $search_fields = geodir_property_rent_custom_fields_advanced_search($post_type);
-        foreach($search_fields as $sfield){
-            geodir_custom_advance_search_field_save( $sfield );
+        foreach ($search_fields as $sfield) {
+            geodir_custom_advance_search_field_save($sfield);
         }
     }
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
 else
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 

geodirectory-admin/dummy-data/recruitment_jobs.php

Indentation +646 added lines, -646 removed lines

@@ -7,232 +7,232 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // Salary
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Salary', 'geodirectory'),
-                      'site_title'          =>  __('Salary', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
-                      'htmlvar_name'        =>  'salary',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-usd',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-
-
-    // Job Type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Type', 'geodirectory'),
-                      'site_title'          =>  __('Job Type','geodirectory'),
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-                      'htmlvar_name'        =>  'job_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Job Sector
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
-                      'site_title'          =>  __('Job Sector','geodirectory'),
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-                      'htmlvar_name'        =>  'job_sector',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	          =>  '[detail]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	      =>  true
-    );
-
-    // Required Experience
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Required Experience', 'geodirectory'),
-                      'site_title'          =>  __('Required Experience', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_experience',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-life-ring',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Required Skills
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'textarea',
-                      'data_type'           =>  'TEXT',
-                      'admin_title'         =>  __('Required Skills', 'geodirectory'),
-                      'site_title'          =>  __('Required Skills', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-area-chart',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    // Company details fieldset
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'fieldset',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Details', 'geodirectory'),
-                      'site_title'          =>  __('Company Details', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_details',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'show_in' 	        =>  '[owntab]'
-
-    );
-
-    // Company Name
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Name', 'geodirectory'),
-                      'site_title'          =>  __('Company Name', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_name',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-    // Company Logo
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'file',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Logo', 'geodirectory'),
-                      'site_title'          =>  __('Company Logo', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_logo',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false,
-                      'extra'               =>  array(
-                          'gd_file_types'   =>  'jpg',
-                          'gd_file_types'   =>  'jpeg',
-                          'gd_file_types'   =>  'gif',
-                          'gd_file_types'   =>  'png',
-                      )
-    );
-
-    // Company Url
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'url',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Url', 'geodirectory'),
-                      'site_title'          =>  __('Company Url', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_url',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// Salary
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Salary', 'geodirectory'),
+					  'site_title'          =>  __('Salary', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
+					  'htmlvar_name'        =>  'salary',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-usd',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+
+
+	// Job Type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Type', 'geodirectory'),
+					  'site_title'          =>  __('Job Type','geodirectory'),
+					  'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+					  'htmlvar_name'        =>  'job_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Job Sector
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Sector','geodirectory'),
+					  'site_title'          =>  __('Job Sector','geodirectory'),
+					  'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+					  'htmlvar_name'        =>  'job_sector',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	          =>  '[detail]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	      =>  true
+	);
+
+	// Required Experience
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Required Experience', 'geodirectory'),
+					  'site_title'          =>  __('Required Experience', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_experience',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-life-ring',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Required Skills
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'textarea',
+					  'data_type'           =>  'TEXT',
+					  'admin_title'         =>  __('Required Skills', 'geodirectory'),
+					  'site_title'          =>  __('Required Skills', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-area-chart',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	// Company details fieldset
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'fieldset',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Details', 'geodirectory'),
+					  'site_title'          =>  __('Company Details', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_details',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'show_in' 	        =>  '[owntab]'
+
+	);
+
+	// Company Name
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Name', 'geodirectory'),
+					  'site_title'          =>  __('Company Name', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_name',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+	// Company Logo
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'file',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Logo', 'geodirectory'),
+					  'site_title'          =>  __('Company Logo', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_logo',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false,
+					  'extra'               =>  array(
+						  'gd_file_types'   =>  'jpg',
+						  'gd_file_types'   =>  'jpeg',
+						  'gd_file_types'   =>  'gif',
+						  'gd_file_types'   =>  'png',
+					  )
+	);
+
+	// Company Url
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'url',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Url', 'geodirectory'),
+					  'site_title'          =>  __('Company Url', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_url',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -242,36 +242,36 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
 
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-    update_option($post_type.'_dummy_data_type','property_sale');
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+	update_option($post_type.'_dummy_data_type','property_sale');
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
 
@@ -280,42 +280,42 @@ 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -325,42 +325,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -370,43 +370,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -416,42 +416,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -461,42 +461,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -506,42 +506,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -551,42 +551,42 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -596,43 +596,43 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -642,39 +642,39 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
 
@@ -684,93 +684,93 @@ 
 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

Spacing +15 added lines, -15 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') {
     $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
+    $package = ($package_id == '') ? '' : array($package_id);
 
     // Salary
     $fields[] = array('listing_type' => $post_type,
@@ -48,15 +48,15 @@ 
                       'field_type'          =>  'select',
                       'data_type'           =>  'VARCHAR',
                       'admin_title'         =>  __('Job Type', 'geodirectory'),
-                      'site_title'          =>  __('Job Type','geodirectory'),
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+                      'site_title'          =>  __('Job Type', 'geodirectory'),
+                      'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
                       'htmlvar_name'        =>  'job_type',
                       'is_active'           =>  true,
                       'for_admin_use'       =>  false,
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -70,16 +70,16 @@ 
     $fields[] = array('listing_type' => $post_type,
                       'field_type'          =>  'select',
                       'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
-                      'site_title'          =>  __('Job Sector','geodirectory'),
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+                      'admin_title'         =>  __('Job Sector', 'geodirectory'),
+                      'site_title'          =>  __('Job Sector', 'geodirectory'),
+                      'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
                       'htmlvar_name'        =>  'job_sector',
                       'is_active'           =>  true,
                       'for_admin_use'       =>  false,
                       'default_value'       =>  '',
                       'show_in' 	          =>  '[detail]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -102,7 +102,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
+                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -235,24 +235,24 @@ 
     return  $fields;
 }
 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
 $post_info = array();
 $image_array = array();
 $post_meta = array();
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
-if($dummy_post_index==1){
+if ($dummy_post_index == 1) {
     // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+    geodir_dummy_data_taxonomies($post_type, $category_array);
 
     // add the dummy custom fields
     $fields = geodir_property_sale_custom_fields($post_type);
     geodir_create_dummy_fields($fields);
-    update_option($post_type.'_dummy_data_type','property_sale');
+    update_option($post_type.'_dummy_data_type', 'property_sale');
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
 else
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 

geodirectory-functions/custom_fields_output_functions.php

Indentation +1540 added lines, -1540 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(!$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(!$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);
 
@@ -832,92 +832,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.
-                        }
-                    }
-                }
-            }
-
-            $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.
+						}
+					}
+				}
+			}
+
+			$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);
 
@@ -934,117 +934,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']};
-            }
-
-            $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']};
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1061,153 +1061,153 @@ 
  */
 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']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-                $seperator = ' | ';
-            }
-
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" 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']}) {
+				$html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+				$seperator = ' | ';
+			}
+
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
+				$html .= $seperator . '<a href="javascript:void(0);" 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);
 
@@ -1224,130 +1224,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);
 
@@ -1365,80 +1365,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);
 
@@ -1456,79 +1456,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);
 
@@ -1546,113 +1546,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);
 
@@ -1669,161 +1669,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(!$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 (!$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);
 
 
 /**
@@ -830,21 +830,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.
          *
@@ -852,11 +852,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.
          *
@@ -865,11 +865,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.
          *
@@ -878,11 +878,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');
@@ -910,16 +910,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);
 
 
 /**
@@ -932,21 +932,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.
          *
@@ -954,11 +954,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.
          *
@@ -967,11 +967,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.
          *
@@ -980,11 +980,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']})):
@@ -1005,7 +1005,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);
             }
 
@@ -1023,15 +1023,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>';
@@ -1046,7 +1046,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);
 
 
 /**
@@ -1059,21 +1059,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.
          *
@@ -1081,11 +1081,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.
          *
@@ -1094,11 +1094,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.
          *
@@ -1107,18 +1107,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;
@@ -1130,7 +1130,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);
@@ -1143,26 +1143,26 @@ 
                 $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']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="javascript:void(0);" 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');}*/
@@ -1182,11 +1182,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.
                      *
@@ -1195,10 +1195,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>';
             }
@@ -1209,7 +1209,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);
 
 
 /**
@@ -1222,21 +1222,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.
          *
@@ -1244,11 +1244,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.
          *
@@ -1257,11 +1257,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.
          *
@@ -1270,11 +1270,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']})):
 
@@ -1282,7 +1282,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) {
@@ -1319,9 +1319,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>';
                         }
                     }
                 }
@@ -1336,11 +1336,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;
@@ -1349,7 +1349,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);
 
 
 
@@ -1363,21 +1363,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.
          *
@@ -1385,11 +1385,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.
          *
@@ -1398,11 +1398,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.
          *
@@ -1411,11 +1411,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']})) {
 
@@ -1430,9 +1430,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>';
 
         }
 
@@ -1440,7 +1440,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);
 
 
 
@@ -1454,21 +1454,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.
          *
@@ -1476,11 +1476,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.
          *
@@ -1489,11 +1489,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.
          *
@@ -1502,11 +1502,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']})) {
 
@@ -1520,9 +1520,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>';
 
         }
 
@@ -1530,7 +1530,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);
 
 
 
@@ -1544,21 +1544,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.
          *
@@ -1566,11 +1566,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.
          *
@@ -1579,11 +1579,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.
          *
@@ -1592,14 +1592,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();
@@ -1617,7 +1617,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;
                         }
                     }
@@ -1631,7 +1631,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);
@@ -1644,9 +1644,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>';
             }
         }
 
@@ -1654,7 +1654,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);
 
 
 /**
@@ -1667,21 +1667,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.
          *
@@ -1689,11 +1689,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.
          *
@@ -1702,11 +1702,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.
          *
@@ -1715,14 +1715,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']) {
 
@@ -1785,10 +1785,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;
@@ -1797,25 +1797,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>';
 
@@ -1826,4 +1826,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/custom_fields_predefined.php

Indentation +403 added lines, -403 removed lines

@@ -17,370 +17,370 @@ 
  */
 function geodir_custom_fields_predefined($post_type=''){
 
-    $custom_fields = array();
-
-
-    // price
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-price',
-        'icon'        =>  'fa fa-usd',
-        'name'        =>  __('Price', 'geodirectory'),
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'decimal_point'       =>  '2',
-            'admin_title'         =>  'Price',
-            'site_title'          =>  'Price',
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
-            'htmlvar_name'        =>  'price',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-usd',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true,
-            'extra_fields'        =>  array(
-                'is_price'                  =>  1,
-                'thousand_separator'        =>  'comma',
-                'decimal_separator'         =>  'period',
-                'decimal_display'           =>  'if',
-                'currency_symbol'           =>  '$',
-                'currency_symbol_placement' =>  'left'
-            )
-        )
-    );
-
-    // property status
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-status',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Status', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Status',
-            'site_title'          =>  'Property Status',
-            'admin_desc'          =>  'Enter the status of the property.',
-            'htmlvar_name'        =>  'property_status',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property furnishing
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-furnishing',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Furnishing',
-            'site_title'          =>  'Furnishing',
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
-            'htmlvar_name'        =>  'property_furnishing',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-th-large',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property type
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-type',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Type', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Type',
-            'site_title'          =>  'Property Type',
-            'admin_desc'          =>  'Select the property type.',
-            'htmlvar_name'        =>  'property_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bedrooms
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bedrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bedrooms',
-            'site_title'          =>  'Bedrooms',
-            'admin_desc'          =>  'Select the number of bedrooms',
-            'htmlvar_name'        =>  'property_bedrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-bed',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bathrooms
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bathrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bathrooms',
-            'site_title'          =>  'Bathrooms',
-            'admin_desc'          =>  'Select the number of bathrooms',
-            'htmlvar_name'        =>  'property_bathrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-bold',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property area
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-area',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Area', 'geodirectory'),
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'admin_title'         =>  'Property Area',
-            'site_title'          =>  'Area (Sq Ft)',
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
-            'htmlvar_name'        =>  'property_area',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-area-chart',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property features
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'multiselect',
-        'class'       =>  'gd-property-features',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Features', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Features',
-            'site_title'          =>  'Features',
-            'admin_desc'          =>  'Select the property features.',
-            'htmlvar_name'        =>  'property_features',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-plus-square',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // Twitter feed
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-twitter',
-        'icon'        =>  'fa fa-twitter',
-        'name'        =>  __('Twitter feed', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Twitter',
-            'site_title'          =>  'Twitter',
-            'admin_desc'          =>  'Enter your Twitter username',
-            'htmlvar_name'        =>  'twitterusername',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[owntab]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
-            'validation_msg'      =>  'Please enter a valid twitter username.',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-twitter',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-    // Get directions link
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-get-directions',
-        'icon'        =>  'fa fa-location-arrow',
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Get Directions',
-            'site_title'          =>  'Get Directions',
-            'admin_desc'          =>  '',
-            'htmlvar_name'        =>  'get_directions',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  true,
-            'default_value'       =>  'Get Directions',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-location-arrow',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-
-    // JOB TYPE CF
-
-    // job type
-    $custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Type', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-            'htmlvar_name'        =>  'job_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // job sector
-    $custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Sector', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-            'htmlvar_name'        =>  'job_sector',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-
-    /**
-     * @see `geodir_custom_fields`
-     */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+	$custom_fields = array();
+
+
+	// price
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-price',
+		'icon'        =>  'fa fa-usd',
+		'name'        =>  __('Price', 'geodirectory'),
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'decimal_point'       =>  '2',
+			'admin_title'         =>  'Price',
+			'site_title'          =>  'Price',
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
+			'htmlvar_name'        =>  'price',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-usd',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true,
+			'extra_fields'        =>  array(
+				'is_price'                  =>  1,
+				'thousand_separator'        =>  'comma',
+				'decimal_separator'         =>  'period',
+				'decimal_display'           =>  'if',
+				'currency_symbol'           =>  '$',
+				'currency_symbol_placement' =>  'left'
+			)
+		)
+	);
+
+	// property status
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-status',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Status', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Status',
+			'site_title'          =>  'Property Status',
+			'admin_desc'          =>  'Enter the status of the property.',
+			'htmlvar_name'        =>  'property_status',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property furnishing
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-furnishing',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Furnishing',
+			'site_title'          =>  'Furnishing',
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
+			'htmlvar_name'        =>  'property_furnishing',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-th-large',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property type
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-type',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Type', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Type',
+			'site_title'          =>  'Property Type',
+			'admin_desc'          =>  'Select the property type.',
+			'htmlvar_name'        =>  'property_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bedrooms
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bedrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bedrooms',
+			'site_title'          =>  'Bedrooms',
+			'admin_desc'          =>  'Select the number of bedrooms',
+			'htmlvar_name'        =>  'property_bedrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-bed',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bathrooms
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bathrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bathrooms',
+			'site_title'          =>  'Bathrooms',
+			'admin_desc'          =>  'Select the number of bathrooms',
+			'htmlvar_name'        =>  'property_bathrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-bold',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property area
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-area',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Area', 'geodirectory'),
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'admin_title'         =>  'Property Area',
+			'site_title'          =>  'Area (Sq Ft)',
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
+			'htmlvar_name'        =>  'property_area',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-area-chart',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property features
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'multiselect',
+		'class'       =>  'gd-property-features',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Features', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Features',
+			'site_title'          =>  'Features',
+			'admin_desc'          =>  'Select the property features.',
+			'htmlvar_name'        =>  'property_features',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-plus-square',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// Twitter feed
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-twitter',
+		'icon'        =>  'fa fa-twitter',
+		'name'        =>  __('Twitter feed', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Twitter',
+			'site_title'          =>  'Twitter',
+			'admin_desc'          =>  'Enter your Twitter username',
+			'htmlvar_name'        =>  'twitterusername',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[owntab]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
+			'validation_msg'      =>  'Please enter a valid twitter username.',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-twitter',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+	// Get directions link
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-get-directions',
+		'icon'        =>  'fa fa-location-arrow',
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Get Directions',
+			'site_title'          =>  'Get Directions',
+			'admin_desc'          =>  '',
+			'htmlvar_name'        =>  'get_directions',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  true,
+			'default_value'       =>  'Get Directions',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-location-arrow',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+
+	// JOB TYPE CF
+
+	// job type
+	$custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Type', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Type', 'geodirectory'),
+			'site_title'          =>  __('Job Type','geodirectory'),
+			'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+			'htmlvar_name'        =>  'job_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// job sector
+	$custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Sector', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Sector','geodirectory'),
+			'site_title'          =>  __('Job Sector','geodirectory'),
+			'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+			'htmlvar_name'        =>  'job_sector',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+
+	/**
+	 * @see `geodir_custom_fields`
+	 */
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
 }
 
 
@@ -395,32 +395,32 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
-    global $post;
+	global $post;
 
 
-    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;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
-        $html .= '</div>';
+		$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
+		$html .= '</div>';
 
-    endif;
+	endif;
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
 
@@ -435,36 +435,36 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
-    global $post;
+	global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
 
-        $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-location-arrow"></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 = '<i class="fa fa-location-arrow"></i>';
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon    = '';
+		}
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
-            $html .= $field_icon_af;
-        }
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+			$html .= $field_icon_af;
+		}
 
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
-        $html .= '</div>';
+		$html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
+		$html .= '</div>';
 
-    }else{
-        $html ='';
-    }
+	}else{
+		$html ='';
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);

Spacing +31 added lines, -31 removed lines

@@ -15,7 +15,7 @@ 
  * @package GeoDirectory
  * @see `geodir_custom_field_save` for array details.
  */
-function geodir_custom_fields_predefined($post_type=''){
+function geodir_custom_fields_predefined($post_type = '') {
 
     $custom_fields = array();
 
@@ -75,7 +75,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -104,7 +104,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -133,7 +133,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -162,7 +162,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -191,7 +191,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -248,7 +248,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -328,15 +328,15 @@ 
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
             'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+            'site_title'          =>  __('Job Type', 'geodirectory'),
+            'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
             'htmlvar_name'        =>  'job_type',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -356,16 +356,16 @@ 
         'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+            'admin_title'         =>  __('Job Sector', 'geodirectory'),
+            'site_title'          =>  __('Job Sector', 'geodirectory'),
+            'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
             'htmlvar_name'        =>  'job_sector',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -380,7 +380,7 @@ 
     /**
      * @see `geodir_custom_fields`
      */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
 }
 
 
@@ -394,11 +394,11 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
     global $post;
 
 
-    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";
 
@@ -413,7 +413,7 @@ 
         }
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
         $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
         $html .= '</div>';
@@ -422,7 +422,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
 
 /**
  * Filter the get_directions custom field output to show a link.
@@ -434,37 +434,37 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
     global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
 
-        $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-location-arrow"></i>';
         } else {
             $field_icon_af = $field_icon;
             $field_icon    = '';
         }
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
             $html .= $field_icon_af;
         }
 
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
+        $html .= '<a href="https://www.google.com/maps/dir//\''.$post->post_latitude.','.$post->post_longitude.'\'/" target="_blank" >'.$link_text.'</a>';
         $html .= '</div>';
 
-    }else{
-        $html ='';
+    } else {
+        $html = '';
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);

geodirectory-functions/ajax_handler_functions.php

Indentation +305 added lines, -305 removed lines

@@ -16,22 +16,22 @@ 
  */

 function geodir_on_wp_loaded()

 {

-    /**

-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request_plugins_loaded');

-    global $wpdb;

+	/**

+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request_plugins_loaded');

+	global $wpdb;

 

 

-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php

+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php

 

-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

-        geodir_send_friend($_REQUEST); // function in custom_functions.php

+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

+		geodir_send_friend($_REQUEST); // function in custom_functions.php

 

-    }

+	}

 

 }

 

@@ -44,9 +44,9 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

-        geodir_user_signup();

-    }

+	if(geodir_is_page('login')) {

+		geodir_user_signup();

+	}

 

 }

 

@@ -59,32 +59,32 @@ 
  */

 function geodir_on_init()

 {

-    /**

-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request');

-    global $wpdb;

+	/**

+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request');

+	global $wpdb;

 

 

 

 

-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {

-        show_admin_bar(false);

-    }

+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {

+		show_admin_bar(false);

+	}

 

 

-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-        die;

-    }

+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+		die;

+	}

 

 

 

@@ -104,289 +104,289 @@ 
  * @todo check if nonce is required here and if so add one.

  */

 function geodir_ajax_handler() {

-    global $wpdb, $gd_session,$post;

+	global $wpdb, $gd_session,$post;

 

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

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

 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

-        echo '1';

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

-    }

-

-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

-        if (current_user_can('manage_options')) {

-            /**

-             * Contains admin ajax handling functions.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

-        } else {

-            wp_redirect(geodir_login_url());

-            gd_die();

-        }

-    }

-

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

-        if (current_user_can('manage_options')) {

-            switch ($_REQUEST['geodir_autofill']):

-                case "geodir_dummy_delete" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

-

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

-                        /**

-                         * Used to delete the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.6.11

-                         * @param string $posttype The post type to insert.

-                         * @param string $datatype The type of dummy data to insert.

-                         */

-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),sanitize_key(['datatype']));

-                    break;

-                case "geodir_dummy_insert" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

-

-                    global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];

-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];

-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

-

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

-                        /**

-                         * Used to insert the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.6.11

-                         * @param string $posttype The post type to insert.

-                         * @param string $datatype The type of dummy data to insert.

-                         * @param int $post_index The item number to insert.

-                         */

-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

-                    }

-

-

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

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

-

-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

-            $template = locate_template(array("geodirectory/popup-forms.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

-            }

-            require_once($template);

-        }

-

-        gd_die();

-    }

-

-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

+		echo '1';

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

+	}

+

+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

+		if (current_user_can('manage_options')) {

+			/**

+			 * Contains admin ajax handling functions.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 */

+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+		} else {

+			wp_redirect(geodir_login_url());

+			gd_die();

+		}

+	}

+

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

+		if (current_user_can('manage_options')) {

+			switch ($_REQUEST['geodir_autofill']):

+				case "geodir_dummy_delete" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

+						return;

+

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

+						/**

+						 * Used to delete the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.6.11

+						 * @param string $posttype The post type to insert.

+						 * @param string $datatype The type of dummy data to insert.

+						 */

+						do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),sanitize_key(['datatype']));

+					break;

+				case "geodir_dummy_insert" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

+						return;

+

+					global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];

+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];

+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];

+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];

+

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

+						/**

+						 * Used to insert the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.6.11

+						 * @param string $posttype The post type to insert.

+						 * @param string $datatype The type of dummy data to insert.

+						 * @param int $post_index The item number to insert.

+						 */

+						do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

+					}

+

+

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

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

+

+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

+			$template = locate_template(array("geodirectory/popup-forms.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

+			}

+			require_once($template);

+		}

+

+		gd_die();

+	}

+

+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');

     }*/

 

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

-        if (is_user_logged_in()) {

-            switch ($_REQUEST['ajax_action']):

-                case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

-                    break;

-                case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

-

-        $is_current_user_owner = true;

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

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

-        }

-

-        $request = $gd_session->get('listing');

-

-        if (is_user_logged_in() && $is_current_user_owner) {

-

-            switch ($_REQUEST['ajax_action']):

-                case "add":

-                case "update":

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-                        $last_id = geodir_save_listing();

-

-                        if ($last_id) {

-                            //$redirect_to = get_permalink( $last_id );

-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-

-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                        } else

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                        wp_redirect($redirect_to);

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "cancel" :

-

-                    $gd_session->un_set('listing');

-

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

-                        wp_redirect(get_permalink($_REQUEST['pid']));

-                    else {

-                        geodir_remove_temp_images();

-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

-                    }

-

-                    break;

-

-                case "publish" :

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-

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

-                            $new_post = array();

-                            $new_post['ID'] = $_REQUEST['pid'];

-

-                            $lastid = wp_update_post($new_post);

-

-                            $gd_session->un_set('listing');

-                            wp_redirect(get_permalink($lastid));

-                        } else {

-                            $last_id = geodir_save_listing();

-

-                            if ($last_id) {

-                                //$redirect_to = get_permalink( $last_id );

-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                            } else

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                            $gd_session->un_set('listing');

-                            wp_redirect($redirect_to);

-                        }

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "delete" :

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

-                        global $current_user;

-

-                        if (get_option('geodir_disable_perm_delete')) {

-                            $lastid = wp_trash_post($_REQUEST['pid']);

-                        } else {

-                            $lastid = wp_delete_post($_REQUEST['pid']);

-                        }

-

-                        if ($lastid && !is_wp_error($lastid))

-                            wp_redirect($_SERVER['HTTP_REFERER']);

-

-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

-                    }

-                    break;

-            endswitch;

-

-            $gd_session->un_set('listing');

-        } else {

-            $gd_session->un_set('listing');

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

-        /**

-         * Contains registration and login functions.

-         * @todo Fix the file path.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

-    }

-

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

-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));

-        if (!empty($_REQUEST['parent_only'])) {

-            $args['parent'] = 0;

-        }

-        $terms_o = get_terms($args);

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

+		if (is_user_logged_in()) {

+			switch ($_REQUEST['ajax_action']):

+				case "add" :

+					geodir_add_to_favorite((int)$_REQUEST['pid']);

+					break;

+				case "remove" :

+					geodir_remove_from_favorite((int)$_REQUEST['pid']);

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

+

+		$is_current_user_owner = true;

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

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

+		}

+

+		$request = $gd_session->get('listing');

+

+		if (is_user_logged_in() && $is_current_user_owner) {

+

+			switch ($_REQUEST['ajax_action']):

+				case "add":

+				case "update":

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+						$last_id = geodir_save_listing();

+

+						if ($last_id) {

+							//$redirect_to = get_permalink( $last_id );

+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+

+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+						} else

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+						wp_redirect($redirect_to);

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "cancel" :

+

+					$gd_session->un_set('listing');

+

+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

+						wp_redirect(get_permalink($_REQUEST['pid']));

+					else {

+						geodir_remove_temp_images();

+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

+					}

+

+					break;

+

+				case "publish" :

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+

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

+							$new_post = array();

+							$new_post['ID'] = $_REQUEST['pid'];

+

+							$lastid = wp_update_post($new_post);

+

+							$gd_session->un_set('listing');

+							wp_redirect(get_permalink($lastid));

+						} else {

+							$last_id = geodir_save_listing();

+

+							if ($last_id) {

+								//$redirect_to = get_permalink( $last_id );

+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+							} else

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+							$gd_session->un_set('listing');

+							wp_redirect($redirect_to);

+						}

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "delete" :

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

+						global $current_user;

+

+						if (get_option('geodir_disable_perm_delete')) {

+							$lastid = wp_trash_post($_REQUEST['pid']);

+						} else {

+							$lastid = wp_delete_post($_REQUEST['pid']);

+						}

+

+						if ($lastid && !is_wp_error($lastid))

+							wp_redirect($_SERVER['HTTP_REFERER']);

+

+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

+					}

+					break;

+			endswitch;

+

+			$gd_session->un_set('listing');

+		} else {

+			$gd_session->un_set('listing');

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

+		/**

+		 * Contains registration and login functions.

+		 * @todo Fix the file path.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+	}

+

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

+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));

+		if (!empty($_REQUEST['parent_only'])) {

+			$args['parent'] = 0;

+		}

+		$terms_o = get_terms($args);

         

-        // Skip terms which has no listing

-        if (!empty($terms_o)) {

-            $filter_terms = array();

+		// Skip terms which has no listing

+		if (!empty($terms_o)) {

+			$filter_terms = array();

             

-            foreach ($terms_o as $term) {

-                if (isset($term->count) && $term->count > 0) {

-                    $filter_terms[] = $term;

-                }

-            }

-            $terms_o = $filter_terms;

-        }

+			foreach ($terms_o as $term) {

+				if (isset($term->count) && $term->count > 0) {

+					$filter_terms[] = $term;

+				}

+			}

+			$terms_o = $filter_terms;

+		}

         

-        $terms = geodir_sort_terms($terms_o, 'count');

-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

-        exit();

-    }

+		$terms = geodir_sort_terms($terms_o, 'count');

+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

+		exit();

+	}

 

-    gd_die();

+	gd_die();

 }

 

 

 function geodir_show_ga_stats(){

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

-        $ga_start = $_REQUEST['ga_start'];

-    } else {

-        $ga_start = '';

-    }

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

-        $ga_end = $_REQUEST['ga_end'];

-    } else {

-        $ga_end = '';

-    }

-    geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

-    die;

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

+		$ga_start = $_REQUEST['ga_start'];

+	} else {

+		$ga_start = '';

+	}

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

+		$ga_end = $_REQUEST['ga_end'];

+	} else {

+		$ga_end = '';

+	}

+	geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

+	die;

 }

 add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );

 add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -44,7 +44,7 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

@@ -82,7 +82,7 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

         die;

     }

 

@@ -104,7 +104,7 @@ 
  * @todo check if nonce is required here and if so add one.

  */

 function geodir_ajax_handler() {

-    global $wpdb, $gd_session,$post;

+    global $wpdb, $gd_session, $post;

 

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

 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

@@ -126,7 +126,7 @@ 
              * @since 1.0.0

              * @package GeoDirectory

              */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');

         } else {

             wp_redirect(geodir_login_url());

             gd_die();

@@ -150,7 +150,7 @@ 
                          * @param string $posttype The post type to insert.

                          * @param string $datatype The type of dummy data to insert.

                          */

-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),sanitize_key(['datatype']));

+                        do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key(['datatype']));

                     break;

                 case "geodir_dummy_insert" :

                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

@@ -162,7 +162,7 @@ 
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

 

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

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

                         /**

                          * Used to insert the dummy post data per post type.

                          *

@@ -173,7 +173,7 @@ 
                          * @param string $datatype The type of dummy data to insert.

                          * @param int $post_index The item number to insert.

                          */

-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

+                        do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));

                     }

 

 

@@ -190,7 +190,7 @@ 
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

             $template = locate_template(array("geodirectory/popup-forms.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';

             }

             require_once($template);

         }

@@ -209,17 +209,17 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

     }

 

     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

         if (is_user_logged_in()) {

             switch ($_REQUEST['ajax_action']):

                 case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

+                    geodir_add_to_favorite((int) $_REQUEST['pid']);

                     break;

                 case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);

                     break;

             endswitch;

         } else {

@@ -232,7 +232,7 @@ 
 

         $is_current_user_owner = true;

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

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

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

         }

 

         $request = $gd_session->get('listing');

@@ -343,7 +343,7 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');

     }

 

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

@@ -374,7 +374,7 @@ 
 }

 

 

-function geodir_show_ga_stats(){

+function geodir_show_ga_stats() {

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

         $ga_start = $_REQUEST['ga_start'];

     } else {

@@ -388,5 +388,5 @@ 
     geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

     die;

 }

-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );

-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file
+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');

+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
\ No newline at end of file

geodirectory-functions/post_functions.php

Indentation +2220 added lines, -2220 removed lines

@@ -20,480 +20,480 @@ 
 function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '')

 {

 

-    $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

-

-    if (!isset($default_cat) || empty($default_cat)) {

-        $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

-            $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

-            }

-        }

+	$post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

+	if (!empty($post_cat_ids))

+		$post_cat_array = explode(",", trim($post_cat_ids, ","));

+

+	if (!isset($default_cat) || empty($default_cat)) {

+		$default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

+	}else{

+		if(!is_int($default_cat)){

+			$category = get_term_by('name', $default_cat, $taxonomy);

+			if(isset($category->term_id)){

+				$default_cat =  $category->term_id;

+			}

+		}

 

-    }

+	}

 

 

-    geodir_save_post_meta($post_id, 'default_category', $default_cat);

+	geodir_save_post_meta($post_id, 'default_category', $default_cat);

 

-    if (isset($category_str) && empty($category_str)) {

+	if (isset($category_str) && empty($category_str)) {

 

-        $post_cat_str = '';

-        $post_categories = array();

-        if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

-            $post_cat_str = implode(",y:#", $post_cat_array);

-            $post_cat_str .= ",y:";

-            $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

-        }

-        $post_categories[$taxonomy] = $post_cat_str;

-        $category_str = $post_categories;

-    }

+		$post_cat_str = '';

+		$post_categories = array();

+		if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

+			$post_cat_str = implode(",y:#", $post_cat_array);

+			$post_cat_str .= ",y:";

+			$post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

+		}

+		$post_categories[$taxonomy] = $post_cat_str;

+		$category_str = $post_categories;

+	}

 

-    $change_cat_str = $category_str[$taxonomy];

+	$change_cat_str = $category_str[$taxonomy];

 

-    $default_pos = strpos($change_cat_str, 'd:');

+	$default_pos = strpos($change_cat_str, 'd:');

 

-    if ($default_pos === false) {

+	if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+		$change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

 

-    }

+	}

 

-    $category_str[$taxonomy] = $change_cat_str;

+	$category_str[$taxonomy] = $change_cat_str;

 

-    update_post_meta($post_id, 'post_categories', $category_str);

+	update_post_meta($post_id, 'post_categories', $category_str);

 

 }

 

 

 if (!function_exists('geodir_save_listing')) {

-    /**

-     * Saves listing in the database using given information.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 New parameter $wp_error added.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

-     * @global object $current_user Current user object.

+	/**

+	 * Saves listing in the database using given information.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 New parameter $wp_error added.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

+	 * @global object $current_user Current user object.

 	 * @global object $gd_session GeoDirectory Session object.

-     * @param array $request_info {

-     *    Array of request info arguments.

-     *

-     *    @type string $action                                  Ajax action name.

-     *    @type string $geodir_ajax                             Ajax type.

-     *    @type string $ajax_action                             Ajax action.

-     *    @type string $listing_type                            Listing type.

-     *    @type string $pid                                     Default Post ID.

-     *    @type string $preview                                 Todo Desc needed.

-     *    @type string $add_listing_page_id                     Add listing page ID.

-     *    @type string $post_title                              Listing title.

-     *    @type string $post_desc                               Listing Description.

-     *    @type string $post_tags                               Listing tags.

-     *    @type array  $cat_limit                               Category limit.

-     *    @type array  $post_category                           Category IDs.

-     *    @type array  $post_category_str                       Category string.

-     *    @type string $post_default_category                   Default category ID.

-     *    @type string $post_address                            Listing address.

-     *    @type string $geodir_location_add_listing_country_val Add listing country value.

-     *    @type string $post_country                            Listing country.

-     *    @type string $geodir_location_add_listing_region_val  Add listing region value.

-     *    @type string $post_region                             Listing region.

-     *    @type string $geodir_location_add_listing_city_val    Add listing city value.

-     *    @type string $post_city                               Listing city.

-     *    @type string $post_zip                                Listing zip.

-     *    @type string $post_latitude                           Listing latitude.

-     *    @type string $post_longitude                          Listing longitude.

-     *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom                            Listing mapzoom Default "9".

-     *    @type string $geodir_timing                           Business timing info.

-     *    @type string $geodir_contact                          Contact number.

-     *    @type string $geodir_email                            Business contact email.

-     *    @type string $geodir_website                          Business website.

-     *    @type string $geodir_twitter                          Twitter link.

-     *    @type string $geodir_facebook                         Facebook link.

-     *    @type string $geodir_video                            Video link.

-     *    @type string $geodir_special_offers                   Speacial offers.

-     *    @type string $post_images                             Post image urls.

-     *    @type string $post_imagesimage_limit                  Post images limit.

-     *    @type string $post_imagestotImg                       Todo Desc needed.

-     *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

-     *    @type string $geodir_spamblocker                      Todo Desc needed.

-     *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

-     *

-     * }

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

-     * @return int|string|WP_Error Created post id or WP_Error on failure.

-     */

-    function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

-    {

-        global $wpdb, $current_user, $gd_session;

-

-        $last_post_id = '';

-

-        if ($gd_session->get('listing') && !$dummy) {

-            $request_info = array();

-            $request_session = $gd_session->get('listing');

-            $request_info = array_merge($_REQUEST, $request_session);

-        } else if (!$gd_session->get('listing') && !$dummy) {

-            global $post;

-            $request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

-            $request_info['post_title'] = $request_info['post_title'];

-            $request_info['listing_type'] = $post->post_type;

-            $request_info['post_desc'] = $request_info['content'];

-        } else if (!$dummy) {

-            return false;

-        }

-

-        /**

-         * Filter the request_info array.

-         *

-         * You can use this filter to modify request_info array.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $request_info See {@see geodir_save_listing()} for accepted args.

-         */

-        $request_info = apply_filters('geodir_action_get_request_info', $request_info);

-

-        // Check if we need to save post location as new location

-        $location_result = geodir_get_default_location();

-

-        if ($location_result->location_id > 0) {

-            if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

-                $request_info['post_location'] = array(

-                    'city' => $request_info['post_city'],

-                    'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

-                    'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

-                    'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

-                    'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''

-                );

-

-                $post_location_info = $request_info['post_location'];

-

-                if ($location_id = geodir_add_new_location($post_location_info)) {

-                    $post_location_id = $location_id;

-                }

-            } else {

-                $post_location_id = $location_result->location_id;

-            }

-        } else {

-            $post_location_id = $location_result->location_id;

-        }

-

-        if ($dummy) {

-            $post_status = 'publish';

-        } else {

-            $post_status = geodir_new_post_default_status();

-        }

-

-        if (isset($request_info['pid']) && $request_info['pid'] != '') {

-            $post_status = get_post_status($request_info['pid']);

-        }

-

-        /* fix change of slug on every title edit */

-        if (!isset($request_info['post_name'])) {

-            $request_info['post_name'] = $request_info['post_title'];

-

-            if (!empty($request_info['pid'])) {

-                $post_info = get_post($request_info['pid']);

-

-                if (!empty($post_info) && isset($post_info->post_name)) {

-                    $request_info['post_name'] = $post_info->post_name;

-                }

-            }

-        }

-

-        $post = array(

-            'post_content' => $request_info['post_desc'],

-            'post_status' => $post_status,

-            'post_title' => $request_info['post_title'],

-            'post_name' => $request_info['post_name'],

-            'post_type' => $request_info['listing_type']

-        );

-

-        /**

-         * Called before a listing is saved to the database.

-         *

-         * @since 1.0.0

-         * @param object $post The post object.

-         */

-        do_action_ref_array('geodir_before_save_listing', $post);

+	 * @param array $request_info {

+	 *    Array of request info arguments.

+	 *

+	 *    @type string $action                                  Ajax action name.

+	 *    @type string $geodir_ajax                             Ajax type.

+	 *    @type string $ajax_action                             Ajax action.

+	 *    @type string $listing_type                            Listing type.

+	 *    @type string $pid                                     Default Post ID.

+	 *    @type string $preview                                 Todo Desc needed.

+	 *    @type string $add_listing_page_id                     Add listing page ID.

+	 *    @type string $post_title                              Listing title.

+	 *    @type string $post_desc                               Listing Description.

+	 *    @type string $post_tags                               Listing tags.

+	 *    @type array  $cat_limit                               Category limit.

+	 *    @type array  $post_category                           Category IDs.

+	 *    @type array  $post_category_str                       Category string.

+	 *    @type string $post_default_category                   Default category ID.

+	 *    @type string $post_address                            Listing address.

+	 *    @type string $geodir_location_add_listing_country_val Add listing country value.

+	 *    @type string $post_country                            Listing country.

+	 *    @type string $geodir_location_add_listing_region_val  Add listing region value.

+	 *    @type string $post_region                             Listing region.

+	 *    @type string $geodir_location_add_listing_city_val    Add listing city value.

+	 *    @type string $post_city                               Listing city.

+	 *    @type string $post_zip                                Listing zip.

+	 *    @type string $post_latitude                           Listing latitude.

+	 *    @type string $post_longitude                          Listing longitude.

+	 *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom                            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing                           Business timing info.

+	 *    @type string $geodir_contact                          Contact number.

+	 *    @type string $geodir_email                            Business contact email.

+	 *    @type string $geodir_website                          Business website.

+	 *    @type string $geodir_twitter                          Twitter link.

+	 *    @type string $geodir_facebook                         Facebook link.

+	 *    @type string $geodir_video                            Video link.

+	 *    @type string $geodir_special_offers                   Speacial offers.

+	 *    @type string $post_images                             Post image urls.

+	 *    @type string $post_imagesimage_limit                  Post images limit.

+	 *    @type string $post_imagestotImg                       Todo Desc needed.

+	 *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

+	 *    @type string $geodir_spamblocker                      Todo Desc needed.

+	 *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

+	 *

+	 * }

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

+	 * @return int|string|WP_Error Created post id or WP_Error on failure.

+	 */

+	function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

+	{

+		global $wpdb, $current_user, $gd_session;

+

+		$last_post_id = '';

+

+		if ($gd_session->get('listing') && !$dummy) {

+			$request_info = array();

+			$request_session = $gd_session->get('listing');

+			$request_info = array_merge($_REQUEST, $request_session);

+		} else if (!$gd_session->get('listing') && !$dummy) {

+			global $post;

+			$request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

+			$request_info['post_title'] = $request_info['post_title'];

+			$request_info['listing_type'] = $post->post_type;

+			$request_info['post_desc'] = $request_info['content'];

+		} else if (!$dummy) {

+			return false;

+		}

+

+		/**

+		 * Filter the request_info array.

+		 *

+		 * You can use this filter to modify request_info array.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $request_info See {@see geodir_save_listing()} for accepted args.

+		 */

+		$request_info = apply_filters('geodir_action_get_request_info', $request_info);

+

+		// Check if we need to save post location as new location

+		$location_result = geodir_get_default_location();

+

+		if ($location_result->location_id > 0) {

+			if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

+				$request_info['post_location'] = array(

+					'city' => $request_info['post_city'],

+					'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

+					'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

+					'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

+					'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''

+				);

+

+				$post_location_info = $request_info['post_location'];

+

+				if ($location_id = geodir_add_new_location($post_location_info)) {

+					$post_location_id = $location_id;

+				}

+			} else {

+				$post_location_id = $location_result->location_id;

+			}

+		} else {

+			$post_location_id = $location_result->location_id;

+		}

 

-        $send_post_submit_mail = false;

+		if ($dummy) {

+			$post_status = 'publish';

+		} else {

+			$post_status = geodir_new_post_default_status();

+		}

 

-        // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

+		if (isset($request_info['pid']) && $request_info['pid'] != '') {

+			$post_status = get_post_status($request_info['pid']);

+		}

 

-        if (isset($request_info['pid']) && $request_info['pid'] != '') {

-            $post['ID'] = $request_info['pid'];

+		/* fix change of slug on every title edit */

+		if (!isset($request_info['post_name'])) {

+			$request_info['post_name'] = $request_info['post_title'];

 

-            $last_post_id = wp_update_post($post, $wp_error);

-        } else {

-            $last_post_id = wp_insert_post($post, $wp_error);

+			if (!empty($request_info['pid'])) {

+				$post_info = get_post($request_info['pid']);

 

-            if (!$dummy && $last_post_id) {

-                $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

-                //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

-            }

-        }

+				if (!empty($post_info) && isset($post_info->post_name)) {

+					$request_info['post_name'] = $post_info->post_name;

+				}

+			}

+		}

+

+		$post = array(

+			'post_content' => $request_info['post_desc'],

+			'post_status' => $post_status,

+			'post_title' => $request_info['post_title'],

+			'post_name' => $request_info['post_name'],

+			'post_type' => $request_info['listing_type']

+		);

+

+		/**

+		 * Called before a listing is saved to the database.

+		 *

+		 * @since 1.0.0

+		 * @param object $post The post object.

+		 */

+		do_action_ref_array('geodir_before_save_listing', $post);

+

+		$send_post_submit_mail = false;

+

+		// unhook this function so it doesn't loop infinitely

+		remove_action('save_post', 'geodir_post_information_save',10,2);

+

+		if (isset($request_info['pid']) && $request_info['pid'] != '') {

+			$post['ID'] = $request_info['pid'];

+

+			$last_post_id = wp_update_post($post, $wp_error);

+		} else {

+			$last_post_id = wp_insert_post($post, $wp_error);

+

+			if (!$dummy && $last_post_id) {

+				$send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

+				//geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

+			}

+		}

 

-        if ($wp_error && is_wp_error($last_post_id)) {

-            return $last_post_id; // Return WP_Error on save failure.

-        }

+		if ($wp_error && is_wp_error($last_post_id)) {

+			return $last_post_id; // Return WP_Error on save failure.

+		}

 

-        if (!$last_post_id) {

-            return false; // Save failure.

-        }

+		if (!$last_post_id) {

+			return false; // Save failure.

+		}

 

-        // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+		// re-hook this function

+		add_action('save_post', 'geodir_post_information_save',10,2);

 

-        $post_tags = '';

-        if (!isset($request_info['post_tags'])) {

+		$post_tags = '';

+		if (!isset($request_info['post_tags'])) {

 

-            $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+			$post_type = $request_info['listing_type'];

+			$post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

 

-        }

+		}

 

-        $gd_post_info = array(

-            "post_title" => $request_info['post_title'],

-            "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

-            "post_status" => $post_status,

-            "post_location_id" => $post_location_id,

-            "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

-            "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

-            "submit_time" => time(),

-            "submit_ip" => $_SERVER['REMOTE_ADDR'],

-        );

+		$gd_post_info = array(

+			"post_title" => $request_info['post_title'],

+			"post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

+			"post_status" => $post_status,

+			"post_location_id" => $post_location_id,

+			"claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

+			"businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

+			"submit_time" => time(),

+			"submit_ip" => $_SERVER['REMOTE_ADDR'],

+		);

 

-        $payment_info = array();

-        $package_info = array();

+		$payment_info = array();

+		$package_info = array();

 

-        $package_info = (array)geodir_post_package_info($package_info, $post);

+		$package_info = (array)geodir_post_package_info($package_info, $post);

 

-        $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

+		$post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

-        if (!empty($package_info) && !$post_package_id) {

-            if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

-            } else {

-                $payment_info['expire_date'] = 'Never';

-            }

+		if (!empty($package_info) && !$post_package_id) {

+			if (isset($package_info['days']) && $package_info['days'] != 0) {

+				$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+			} else {

+				$payment_info['expire_date'] = 'Never';

+			}

 

-            $payment_info['package_id'] = $package_info['pid'];

-            $payment_info['alive_days'] = $package_info['days'];

-            $payment_info['is_featured'] = $package_info['is_featured'];

+			$payment_info['package_id'] = $package_info['pid'];

+			$payment_info['alive_days'] = $package_info['days'];

+			$payment_info['is_featured'] = $package_info['is_featured'];

 

-            $gd_post_info = array_merge($gd_post_info, $payment_info);

-        }

+			$gd_post_info = array_merge($gd_post_info, $payment_info);

+		}

 

-        $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

+		$custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

 

-        foreach ($custom_metaboxes as $key => $val):

+		foreach ($custom_metaboxes as $key => $val):

 

-            $name = $val['name'];

-            $type = $val['type'];

-            $extrafields = $val['extra_fields'];

+			$name = $val['name'];

+			$type = $val['type'];

+			$extrafields = $val['extra_fields'];

 

-            if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+			if (trim($type) == 'address') {

+				$prefix = $name . '_';

+				$address = $prefix . 'address';

 

-                if (isset($request_info[$address]) && $request_info[$address] != '') {

-                    $gd_post_info[$address] = wp_slash($request_info[$address]);

-                }

+				if (isset($request_info[$address]) && $request_info[$address] != '') {

+					$gd_post_info[$address] = wp_slash($request_info[$address]);

+				}

 

-                if ($extrafields != '') {

-                    $extrafields = unserialize($extrafields);

+				if ($extrafields != '') {

+					$extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+					if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

 

-                        $location_result = geodir_get_default_location();

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+						$gd_post_info[$prefix . 'city'] = $location_result->city;

+						$gd_post_info[$prefix . 'region'] = $location_result->region;

+						$gd_post_info[$prefix . 'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

 

-                    } else {

+					} else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+						$gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

+						$gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

+						$gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

 

-                        //----------set post locations when import dummy data-------

-                        $location_result = geodir_get_default_location();

+						//----------set post locations when import dummy data-------

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

-                        //-----------------------------------------------------------------

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						//-----------------------------------------------------------------

 

-                    }

+					}

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

-                    }

+					if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

+						$gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+					}

 

 

-                    if (isset($extrafields['show_map']) && $extrafields['show_map']) {

+					if (isset($extrafields['show_map']) && $extrafields['show_map']) {

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

-                        }

+						if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

+							$gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

-                        }

+						if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

+							$gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

-                        }

+						if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

+							$gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

-                        }

+						if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

+							$gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+						}

 

-                    }

+					}

 

-                    // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

-                    }

-                }

+					// show lat lng

+					if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

+						$gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+					}

+				}

 

-            } elseif (trim($type) == 'file') {

-                if (isset($request_info[$name])) {

-                    $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+			} elseif (trim($type) == 'file') {

+				if (isset($request_info[$name])) {

+					$request_files = array();

+					if ($request_info[$name] != '')

+						$request_files = explode(",", $request_info[$name]);

 

-                    $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

-                    geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

+					$extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

+					geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

 

-                }

-            } elseif (trim($type) == 'datepicker') {

-                $datetime = '';

-                if (isset($request_info[$name]) && $request_info[$name] != '') {

-                    $date_format = geodir_default_date_format();

-                    if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

-                        $extra_fields = unserialize($val['extra_fields']);

-                        $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;

-                    }

+				}

+			} elseif (trim($type) == 'datepicker') {

+				$datetime = '';

+				if (isset($request_info[$name]) && $request_info[$name] != '') {

+					$date_format = geodir_default_date_format();

+					if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

+						$extra_fields = unserialize($val['extra_fields']);

+						$date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['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 5 then it's the old style 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 5 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);

+						$date_format = str_replace($search, $replace, $date_format);

 

-                        $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

+						$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

-                        $post_htmlvar_value = $request_info[$name];

-                    }

+					}else{

+						$post_htmlvar_value = $request_info[$name];

+					}

 

-                    $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d

-                    $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

+					$post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d

+					$datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

 

-                    //$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

+					//$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

 

-                }

-                $gd_post_info[$name] = $datetime;

-            } else if ($type == 'multiselect') {

-                if (isset($request_info[$name])) {

-                    $gd_post_info[$name] = $request_info[$name];

-                } else {

-                    if (isset($request_info['gd_field_' . $name])) {

-                        $gd_post_info[$name] = ''; /* fix de-select for multiselect */

-                    }

-                }

-            } else if (isset($request_info[$name])) {

-                $gd_post_info[$name] = $request_info[$name];

-            }

+				}

+				$gd_post_info[$name] = $datetime;

+			} else if ($type == 'multiselect') {

+				if (isset($request_info[$name])) {

+					$gd_post_info[$name] = $request_info[$name];

+				} else {

+					if (isset($request_info['gd_field_' . $name])) {

+						$gd_post_info[$name] = ''; /* fix de-select for multiselect */

+					}

+				}

+			} else if (isset($request_info[$name])) {

+				$gd_post_info[$name] = $request_info[$name];

+			}

 

-        endforeach;

+		endforeach;

 

-        if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

-            $gd_post_info['post_dummy'] = $request_info['post_dummy'];

-        }

+		if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

+			$gd_post_info['post_dummy'] = $request_info['post_dummy'];

+		}

 

-        // Save post detail info in detail table

-        if (!empty($gd_post_info)) {

-            geodir_save_post_info($last_post_id, $gd_post_info);

-        }

+		// Save post detail info in detail table

+		if (!empty($gd_post_info)) {

+			geodir_save_post_info($last_post_id, $gd_post_info);

+		}

 

 

-        // Set categories to the listing

-        if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

-            $post_category = array();

+		// Set categories to the listing

+		if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

+			$post_category = array();

 

-            foreach ($request_info['post_category'] as $taxonomy => $cat) {

+			foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+				if ($dummy)

+					$post_category = $cat;

+				else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+					if (!is_array($cat) && strstr($cat, ','))

+						$cat = explode(',', $cat);

 

-                    if (!empty($cat) && is_array($cat))

-                        $post_category = array_map('intval', $cat);

-                }

+					if (!empty($cat) && is_array($cat))

+						$post_category = array_map('intval', $cat);

+				}

 

-                wp_set_object_terms($last_post_id, $post_category, $taxonomy);

-            }

+				wp_set_object_terms($last_post_id, $post_category, $taxonomy);

+			}

 

-            $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

+			$post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

 

-            $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

-            geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

+			$post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

+			geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

 

-        }

+		}

 

-        $post_tags = '';

-        // Set tags to the listing

-        if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

-            $post_tags = explode(",", $request_info['post_tags']);

-        } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

-        } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

-        }

+		$post_tags = '';

+		// Set tags to the listing

+		if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

+			$post_tags = explode(",", $request_info['post_tags']);

+		} elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

+			if ($dummy)

+				$post_tags = $request_info['post_tags'];

+		} else {

+			if ($dummy)

+				$post_tags = array($request_info['post_title']);

+		}

 

-        if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

-            wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

-        }

+		if (is_array($post_tags)) {

+			$taxonomy = $request_info['listing_type'] . '_tags';

+			wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

+		}

 

 

-        // Insert attechment

+		// Insert attechment

 

-        if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

-            if (!$dummy) {

-                $tmpimgArr = trim($request_info['post_images'], ",");

-                $tmpimgArr = explode(",", $tmpimgArr);

-                geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

-                geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

-            }

+		if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

+			if (!$dummy) {

+				$tmpimgArr = trim($request_info['post_images'], ",");

+				$tmpimgArr = explode(",", $tmpimgArr);

+				geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

+			} else{

+				geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

+			}

 

 

-        } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

+		} elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

 

-            /* Delete Attachments

+			/* Delete Attachments

 			$postcurr_images = geodir_get_images($last_post_id);

 

 			$wpdb->query(

@@ -509,34 +509,34 @@ 
 			geodir_save_post_info($last_post_id, $gd_post_featured_img);

 			*/

 

-        }

+		}

 

-        geodir_remove_temp_images();

-        geodir_set_wp_featured_image($last_post_id);

+		geodir_remove_temp_images();

+		geodir_set_wp_featured_image($last_post_id);

 

-        /**

-         * Called after a listing is saved to the database and before any email have been sent.

-         *

-         * @since 1.0.0

-         * @param int $last_post_id The saved post ID.

-         * @param array $request_info The post details in an array.

-         * @see 'geodir_after_save_listinginfo'

-         */

-        do_action('geodir_after_save_listing', $last_post_id, $request_info);

+		/**

+		 * Called after a listing is saved to the database and before any email have been sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $last_post_id The saved post ID.

+		 * @param array $request_info The post details in an array.

+		 * @see 'geodir_after_save_listinginfo'

+		 */

+		do_action('geodir_after_save_listing', $last_post_id, $request_info);

 

-        //die;

+		//die;

 

-        if ($send_post_submit_mail) { // if new post send out email

-            $to_name = geodir_get_client_name($current_user->ID);

-            geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

-        }

-        /*

+		if ($send_post_submit_mail) { // if new post send out email

+			$to_name = geodir_get_client_name($current_user->ID);

+			geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

+		}

+		/*

          * Unset the session so we don't loop.

          */

-        $gd_session->un_set('listing');

-        return $last_post_id;

+		$gd_session->un_set('listing');

+		return $last_post_id;

 

-    }

+	}

 

 }

 

@@ -555,594 +555,594 @@ 
 function geodir_get_post_info($post_id = '')

 {

 

-    global $wpdb, $plugin_prefix, $post, $post_info;

+	global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+	if ($post_id == '' && !empty($post))

+		$post_id = $post->ID;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!in_array($post_type, $all_postypes))

-        return false;

+	if (!in_array($post_type, $all_postypes))

+		return false;

 

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

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

 

-    /**

-     * Apply Filter to change Post info

-     *

-     * You can use this filter to change Post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+	/**

+	 * Apply Filter to change Post info

+	 *

+	 * You can use this filter to change Post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	$query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

-    $post_detail = $wpdb->get_row($query);

+	$post_detail = $wpdb->get_row($query);

 

-    return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

+	return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

 

 }

 

 

 if (!function_exists('geodir_save_post_info')) {

-    /**

-     * Saves post detail info in detail table.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param array $postinfo_array {

-     *    Post info that needs to be saved in detail table.

-     *

-     *    @type string $post_title              Listing title.

-     *    @type string $post_tags               Listing tags.

-     *    @type string $post_status             Listing post status.

-     *    @type string $post_location_id        Listing location ID.

-     *    @type string $claimed                 Todo Desc needed.

-     *    @type string $businesses              Todo Desc needed.

-     *    @type int    $submit_time             Submitted time in unix timestamp.

-     *    @type string $submit_ip               Submitted IP.

-     *    @type string $expire_date             Listing expiration date.

-     *    @type int    $package_id              Listing package ID.

-     *    @type int    $alive_days              Todo Desc needed.

-     *    @type int    $is_featured             Is this a featured listing?.

-     *    @type string $post_address            Listing address.

-     *    @type string $post_city               Listing city.

-     *    @type string $post_region             Listing region.

-     *    @type string $post_country            Listing country.

-     *    @type string $post_locations          Listing locations.

-     *    @type string $post_zip                Listing zip.

-     *    @type string $post_latitude           Listing latitude.

-     *    @type string $post_longitude          Listing longitude.

-     *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom            Listing mapzoom Default "9".

-     *    @type string $geodir_timing           Business timing info.

-     *    @type string $geodir_contact          Contact number.

-     *    @type string $geodir_email            Business contact email.

-     *    @type string $geodir_website          Business website.

-     *    @type string $geodir_twitter          Twitter link.

-     *    @type string $geodir_facebook         Facebook link.

-     *    @type string $geodir_video            Video link.

-     *    @type string $geodir_special_offers   Speacial offers.

-     *

-     * }

-     * @return bool

-     */

-    function geodir_save_post_info($post_id, $postinfo_array = array())

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        /**

-         * Filter to change Post info

-         *

-         * You can use this filter to change Post info.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-         * @param int $post_id The post ID.

-         */

-        $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+	/**

+	 * Saves post detail info in detail table.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param array $postinfo_array {

+	 *    Post info that needs to be saved in detail table.

+	 *

+	 *    @type string $post_title              Listing title.

+	 *    @type string $post_tags               Listing tags.

+	 *    @type string $post_status             Listing post status.

+	 *    @type string $post_location_id        Listing location ID.

+	 *    @type string $claimed                 Todo Desc needed.

+	 *    @type string $businesses              Todo Desc needed.

+	 *    @type int    $submit_time             Submitted time in unix timestamp.

+	 *    @type string $submit_ip               Submitted IP.

+	 *    @type string $expire_date             Listing expiration date.

+	 *    @type int    $package_id              Listing package ID.

+	 *    @type int    $alive_days              Todo Desc needed.

+	 *    @type int    $is_featured             Is this a featured listing?.

+	 *    @type string $post_address            Listing address.

+	 *    @type string $post_city               Listing city.

+	 *    @type string $post_region             Listing region.

+	 *    @type string $post_country            Listing country.

+	 *    @type string $post_locations          Listing locations.

+	 *    @type string $post_zip                Listing zip.

+	 *    @type string $post_latitude           Listing latitude.

+	 *    @type string $post_longitude          Listing longitude.

+	 *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing           Business timing info.

+	 *    @type string $geodir_contact          Contact number.

+	 *    @type string $geodir_email            Business contact email.

+	 *    @type string $geodir_website          Business website.

+	 *    @type string $geodir_twitter          Twitter link.

+	 *    @type string $geodir_facebook         Facebook link.

+	 *    @type string $geodir_video            Video link.

+	 *    @type string $geodir_special_offers   Speacial offers.

+	 *

+	 * }

+	 * @return bool

+	 */

+	function geodir_save_post_info($post_id, $postinfo_array = array())

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		/**

+		 * Filter to change Post info

+		 *

+		 * You can use this filter to change Post info.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+		 * @param int $post_id The post ID.

+		 */

+		$postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+

+		if (!empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey => $mval) {

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

+					if (is_array($mval)) {

+						$mval = implode(",", $mval);

+					}

+

+					$post_meta_set_query .= $mkey . " = '" . addslashes_gpc($mval) . "', ";

+				}

+			}

 

-        if (!empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

+            

+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

+				return false;

+			}

 

-            foreach ($postmeta as $mkey => $mval) {

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

-                    if (is_array($mval)) {

-                        $mval = implode(",", $mval);

-                    }

+			$post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

 

-                    $post_meta_set_query .= $mkey . " = '" . addslashes_gpc($mval) . "', ";

-                }

-            }

 

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

-            

-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

-                return false;

-            }

+			/**

+			 * Called before saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+			 * @param int $post_id The post ID.

+			 */

+			do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+						array($post_id)

+					)

+				);

 

-            /**

-             * Called before saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-             * @param int $post_id The post ID.

-             */

-            do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+			} else {

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

-                        array($post_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+						array($post_id)

+					)

+				);

 

+			}

 

-            } else {

+			/**

+			 * Called after saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array Post info that needs to be saved in detail table.

+			 * @param int $post_id The post ID.

+			 * @see 'geodir_after_save_listing'

+			 */

+			do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

+

+			return true;

+		} else

+			return false;

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

-                        array($post_id)

-                    )

-                );

+	}

+}

 

-            }

 

-            /**

-             * Called after saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array Post info that needs to be saved in detail table.

-             * @param int $post_id The post ID.

-             * @see 'geodir_after_save_listing'

-             */

-            do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

+if (!function_exists('geodir_save_post_meta')) {

+	/**

+	 * Save or update post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @param string $meta_value Detail table column value.

+	 * @return void|bool

+	 */

+	function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

+

+			if (is_array($meta_value)) {

+				$meta_value = implode(",", $meta_value);

+			}

 

-            return true;

-        } else

-            return false;

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-    }

-}

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+						array($post_id)

+					)

+				);

 

+			} else {

 

-if (!function_exists('geodir_save_post_meta')) {

-    /**

-     * Save or update post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @param string $meta_value Detail table column value.

-     * @return void|bool

-     */

-    function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

-

-            if (is_array($meta_value)) {

-                $meta_value = implode(",", $meta_value);

-            }

-

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

-                        array($post_id)

-                    )

-                );

-

-            } else {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

-                        array($post_id)

-                    )

-                );

-            }

-

-

-        } else

-            return false;

-    }

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+						array($post_id)

+					)

+				);

+			}

+

+

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_delete_post_meta')) {

-    /**

-     * Delete post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @todo check if this is depreciated

-     * @todo Fix unknown variable mval

-     * @return bool

-     */

-    function geodir_delete_post_meta($post_id, $postmeta)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if (is_array($postmeta) && !empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

-

-            foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

-            }

-

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

+	/**

+	 * Delete post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @todo check if this is depreciated

+	 * @todo Fix unknown variable mval

+	 * @return bool

+	 */

+	function geodir_delete_post_meta($post_id, $postmeta)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (is_array($postmeta) && !empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey) {

+				if ($mval != '')

+					$post_meta_set_query .= $mkey . " = '', ";

+			}

+

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

             

-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

-                return false;

-            }

-

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } else

-            return false;

-    }

+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

+				return false;

+			}

+

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} elseif ($postmeta != '' && $post_id) {

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} else

+			return false;

+	}

 }

 

 

 if (!function_exists('geodir_get_post_meta')) {

-    /**

-     * Get post custom meta.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $meta_key The meta key to retrieve.

-     * @param bool $single Optional. Whether to return a single value. Default false.

-     * @todo single variable not yet implemented.

-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

-     */

-    function geodir_get_post_meta($post_id, $meta_key, $single = false)

-    {

-        if (!$post_id) {

-            return false;

-        }

-        global $wpdb, $plugin_prefix;

-

-        $all_postypes = geodir_get_posttypes();

-

-        $post_type = get_post_type($post_id);

-

-        if (!in_array($post_type, $all_postypes))

-            return false;

-

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

-

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+	/**

+	 * Get post custom meta.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $meta_key The meta key to retrieve.

+	 * @param bool $single Optional. Whether to return a single value. Default false.

+	 * @todo single variable not yet implemented.

+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

+	 */

+	function geodir_get_post_meta($post_id, $meta_key, $single = false)

+	{

+		if (!$post_id) {

+			return false;

+		}

+		global $wpdb, $plugin_prefix;

+

+		$all_postypes = geodir_get_posttypes();

+

+		$post_type = get_post_type($post_id);

+

+		if (!in_array($post_type, $all_postypes))

+			return false;

+

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

+

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

+			$meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

             

-            if ($meta_value && $meta_value !== '') {

-                return maybe_serialize($meta_value);

-            } else

-                return $meta_value;

-        } else {

-            return false;

-        }

-    }

+			if ($meta_value && $meta_value !== '') {

+				return maybe_serialize($meta_value);

+			} else

+				return $meta_value;

+		} else {

+			return false;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_save_post_images')) {

-    /**

-     * Save post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     * @param array $post_image Post image urls as an array.

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     */

-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

-    {

-

+	/**

+	 * Save post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 * @param array $post_image Post image urls as an array.

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 */

+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

+		global $wpdb, $plugin_prefix, $current_user;

 

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

+		$post_type = get_post_type($post_id);

 

-        $post_images = geodir_get_images($post_id);

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

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

-                array($post_id)

-            )

-        );

+		$post_images = geodir_get_images($post_id);

 

-        $invalid_files = $post_images;

-        $valid_file_ids = array();

-        $valid_files_condition = '';

-        $geodir_uploaddir = '';

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+				array($post_id)

+			)

+		);

 

-        $remove_files = array();

+		$invalid_files = $post_images;

+		$valid_file_ids = array();

+		$valid_files_condition = '';

+		$geodir_uploaddir = '';

 

-        if (!empty($post_image)) {

+		$remove_files = array();

 

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+		if (!empty($post_image)) {

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $invalid_files = array();

-            $postcurr_images = array();

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

 

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

-                $menu_order = $m + 1;

+			$invalid_files = array();

+			$postcurr_images = array();

 

-                $file_path = '';

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

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

+				$menu_order = $m + 1;

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+				$file_path = '';

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

 

-                $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

 

+				$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    /* --------- end ------- */

-                    $curr_img_url = $post_image[$m];

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    $image_name_arr = explode('/', $curr_img_url);

+					/* --------- end ------- */

+					$curr_img_url = $post_image[$m];

 

-                    $count_image_name_arr = count($image_name_arr) - 2;

+					$image_name_arr = explode('/', $curr_img_url);

 

-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

+					$count_image_name_arr = count($image_name_arr) - 2;

 

-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];

+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

 

-                    $filename = end($image_name_arr);

-                    if (strpos($filename, '?') !== false) {

-                        list($filename) = explode('?', $filename);

-                    }

+					$curr_img_dir = $image_name_arr[$count_image_name_arr];

 

-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);

+					$filename = end($image_name_arr);

+					if (strpos($filename, '?') !== false) {

+						list($filename) = explode('?', $filename);

+					}

 

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);

 

-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {

-                        $new_img_name_arr = $img_name_arr;

-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

-                            unset($new_img_name_arr[count($img_name_arr) - 1]);

-                            $file_title = implode('.', $new_img_name_arr);

-                        }

-                    }

-                    $file_title = sanitize_file_name($file_title);

-                    $file_name = sanitize_file_name($filename);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {

+						$new_img_name_arr = $img_name_arr;

+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

+							unset($new_img_name_arr[count($img_name_arr) - 1]);

+							$file_title = implode('.', $new_img_name_arr);

+						}

+					}

+					$file_title = sanitize_file_name($file_title);

+					$file_name = sanitize_file_name($filename);

 

-                    $uploaded_file_type = $arr_file_type['type'];

+					$arr_file_type = wp_check_filetype($filename);

 

-                    // Set an array containing a list of acceptable formats

-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

+					$uploaded_file_type = $arr_file_type['type'];

 

-                    // If the uploaded file is the right format

-                    if (in_array($uploaded_file_type, $allowed_file_types)) {

-                        if (!function_exists('wp_handle_upload')) {

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

-                        }

+					// Set an array containing a list of acceptable formats

+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

 

-                        if (!is_dir($geodir_uploadpath)) {

-                            mkdir($geodir_uploadpath);

-                        }

+					// If the uploaded file is the right format

+					if (in_array($uploaded_file_type, $allowed_file_types)) {

+						if (!function_exists('wp_handle_upload')) {

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

+						}

 

-                        $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

-                        } else {

-                            $external_img = true;

-                        }

+						if (!is_dir($geodir_uploadpath)) {

+							mkdir($geodir_uploadpath);

+						}

 

-                        if ($dummy || $external_img) {

-                            $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+						$external_img = false;

+						if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+						} else {

+							$external_img = true;

+						}

 

-                            if (isset($uploaded['error']) && empty($uploaded['error'])) {

-                                $new_name = basename($uploaded['file']);

-                                $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

-                            }

-                            $external_img = false;

-                        } else {

-                            $new_name = $post_id . '_' . $file_name;

+						if ($dummy || $external_img) {

+							$uploaded_file = array();

+							$uploaded = (array)fetch_remote_file($curr_img_url);

 

-                            if ($curr_img_dir == $sub_dir) {

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

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

-                            } else {

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

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

-                            }

+							if (isset($uploaded['error']) && empty($uploaded['error'])) {

+								$new_name = basename($uploaded['file']);

+								$uploaded_file = $uploaded;

+							}else{

+								print_r($uploaded);exit;

+							}

+							$external_img = false;

+						} else {

+							$new_name = $post_id . '_' . $file_name;

 

-                            $uploaded_file = '';

+							if ($curr_img_dir == $sub_dir) {

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

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

+							} else {

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

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

+							}

 

-                            if (file_exists($img_path)) {

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

-                                $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

-                                $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

-                            }

+							$uploaded_file = '';

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

-                        }

+							if (file_exists($img_path)) {

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

+								$file_path = '';

+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+								$uploaded_file = true;

+								$file_path = $curr_img_dir . '/' . $filename;

+							}

 

-                        if (!empty($uploaded_file)) {

-                            if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

-                            }

+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

+								unlink($img_path);

+						}

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+						if (!empty($uploaded_file)) {

+							if (!isset($file_path) || !$file_path) {

+								$file_path = $sub_dir . '/' . $new_name;

+							}

 

-                            if ($menu_order == 1) {

+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

 

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

+							if ($menu_order == 1) {

 

-                            }

+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

 

-                            // Set up options array to add this file as an attachment

-                            $attachment = array();

-                            $attachment['post_id'] = $post_id;

-                            $attachment['title'] = $file_title;

-                            $attachment['content'] = '';

-                            $attachment['file'] = $file_path;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

+							}

 

-                            $attachment_set = '';

+							// Set up options array to add this file as an attachment

+							$attachment = array();

+							$attachment['post_id'] = $post_id;

+							$attachment['title'] = $file_title;

+							$attachment['content'] = '';

+							$attachment['file'] = $file_path;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

 

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

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

-                            }

+							$attachment_set = '';

 

-                            $attachment_set = trim($attachment_set, ", ");

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

+								if ($val != '')

+									$attachment_set .= $key . " = '" . $val . "', ";

+							}

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+							$attachment_set = trim($attachment_set, ", ");

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

 

-                            $valid_file_ids[] = $wpdb->insert_id;

-                        }

+							$valid_file_ids[] = $wpdb->insert_id;

+						}

 

-                    }

+					}

 

 

-                } else {

-                    $valid_file_ids[] = $find_image;

+				} else {

+					$valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

-                            array($menu_order, $split_img_path[1], $post_id)

-                        )

-                    );

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+							array($menu_order, $split_img_path[1], $post_id)

+						)

+					);

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+					if ($menu_order == 1)

+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

-                }

+				}

 

 

-            }

+			}

 

-            if (!empty($valid_file_ids)) {

+			if (!empty($valid_file_ids)) {

 

-                $remove_files = $valid_file_ids;

+				$remove_files = $valid_file_ids;

 

-                $remove_files_length = count($remove_files);

-                $remove_files_format = array_fill(0, $remove_files_length, '%d');

-                $format = implode(',', $remove_files_format);

-                $valid_files_condition = " ID NOT IN ($format) AND ";

+				$remove_files_length = count($remove_files);

+				$remove_files_format = array_fill(0, $remove_files_length, '%d');

+				$format = implode(',', $remove_files_format);

+				$valid_files_condition = " ID NOT IN ($format) AND ";

 

-            }

+			}

 

-            //Get and remove all old images of post from database to set by new order

+			//Get and remove all old images of post from database to set by new order

 

-            if (!empty($post_images)) {

+			if (!empty($post_images)) {

 

-                foreach ($post_images as $img) {

+				foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

 

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

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

 

-                    }

+					}

 

-                }

+				}

 

-            }

+			}

 

-            $invalid_files = (object)$invalid_files;

-        }

+			$invalid_files = (object)$invalid_files;

+		}

 

-        $remove_files[] = $post_id;

+		$remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

-    }

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

+	}

 

 }

 

@@ -1156,12 +1156,12 @@ 
 function geodir_remove_temp_images()

 {

 

-    global $current_user;

+	global $current_user;

 

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

 

-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

 

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

 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {

@@ -1178,8 +1178,8 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

-    geodir_delete_directory($dirname);

+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;

+	geodir_delete_directory($dirname);

 }

 

 

@@ -1193,116 +1193,116 @@ 
  */

 function geodir_delete_directory($dirname)

 {

-    $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

-    while ($file = readdir($dir_handle)) {

-        if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

-        }

-    }

-    closedir($dir_handle);

-    rmdir($dirname);

-    return true;

+	$dir_handle = '';

+	if (is_dir($dirname))

+		$dir_handle = opendir($dirname);

+	if (!$dir_handle)

+		return false;

+	while ($file = readdir($dir_handle)) {

+		if ($file != "." && $file != "..") {

+			if (!is_dir($dirname . "/" . $file))

+				unlink($dirname . "/" . $file);

+			else

+				geodir_delete_directory($dirname . '/' . $file);

+		}

+	}

+	closedir($dir_handle);

+	rmdir($dirname);

+	return true;

 

 }

 

 

 if (!function_exists('geodir_remove_attachments')) {

-    /**

-     * Remove post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $postcurr_images Array of image objects.

-     */

-    function geodir_remove_attachments($postcurr_images = array())

-    {

-        // Unlink all past images of post

-        if (!empty($postcurr_images)) {

-

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-

-            foreach ($postcurr_images as $postimg) {

-                $image_name_arr = explode('/', $postimg->src);

-                $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

-            }

-

-        } // endif

-        // Unlink all past images of post end

-    }

+	/**

+	 * Remove post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $postcurr_images Array of image objects.

+	 */

+	function geodir_remove_attachments($postcurr_images = array())

+	{

+		// Unlink all past images of post

+		if (!empty($postcurr_images)) {

+

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+

+			foreach ($postcurr_images as $postimg) {

+				$image_name_arr = explode('/', $postimg->src);

+				$filename = end($image_name_arr);

+				if (file_exists($uploads_dir . '/' . $filename))

+					unlink($uploads_dir . '/' . $filename);

+			}

+

+		} // endif

+		// Unlink all past images of post end

+	}

 }

 

 if (!function_exists('geodir_get_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

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

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|object Image details as an object.

-     */

-    function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

-    {

-

-        /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

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

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|object Image details as an object.

+	 */

+	function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

+	{

+

+		/*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

         $img_arr['path'] = '';

         $img_arr['width'] = '';

         $img_arr['height'] = '';

         $img_arr['title'] = '';

         return (object)$img_arr;*/

-        global $wpdb, $plugin_prefix, $post;

+		global $wpdb, $plugin_prefix, $post;

 

-        if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {

-            $post_type = $post->post_type;

-        } else {

-            $post_type = get_post_type($post_id);

-        }

+		if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {

+			$post_type = $post->post_type;

+		} else {

+			$post_type = get_post_type($post_id);

+		}

 

-        if (!in_array($post_type, geodir_get_posttypes())) {

-            return false;// if not a GD CPT return;

-        }

+		if (!in_array($post_type, geodir_get_posttypes())) {

+			return false;// if not a GD CPT return;

+		}

 

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

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

 

-        if (!$file) {

-            if (isset($post->featured_image)) {

-                $file = $post->featured_image;

-            } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

-            }

-        }

+		if (!$file) {

+			if (isset($post->featured_image)) {

+				$file = $post->featured_image;

+			} else {

+				$file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+			}

+		}

 

-        if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

-            $img_arr = array();

+		if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

+			$img_arr = array();

 

-            $file_info = pathinfo($file);

-            $sub_dir = '';

-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                $sub_dir = stripslashes_deep($file_info['dirname']);

+			$file_info = pathinfo($file);

+			$sub_dir = '';

+			if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+				$sub_dir = stripslashes_deep($file_info['dirname']);

 

-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-            $uploads_baseurl = $uploads['baseurl'];

-            $uploads_path = $uploads['path'];

+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+			$uploads_baseurl = $uploads['baseurl'];

+			$uploads_path = $uploads['path'];

 

-            $file_name = $file_info['basename'];

+			$file_name = $file_info['basename'];

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

-            /*

+			$uploads_url = $uploads_baseurl . $sub_dir;

+			/*

              * Allows the filter of image src for such things as CDN change.

              *

              * @since 1.5.7

@@ -1311,158 +1311,158 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

-            $width = 0;

-            $height = 0;

-            if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                $imagesize = getimagesize($img_arr['path']);

-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

-            $img_arr['width'] = $width;

-            $img_arr['height'] = $height;

-            $img_arr['title'] = '';

-        } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

-            foreach ($post_images as $image) {

-                return $image;

-            }

-        } else if ($no_image) {

-            $img_arr = array();

-

-            $default_img = '';

-            if (isset($post->default_category) && $post->default_category) {

-                $default_cat = $post->default_category;

-            } else {

-                $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            }

-

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

-                $uploads = wp_upload_dir(); // Array of key => value pairs

-                $uploads_baseurl = $uploads['baseurl'];

-                $uploads_path = $uploads['path'];

-

-                $img_arr = array();

-

-                $file_info = pathinfo($default_img);

-

-                $file_name = $file_info['basename'];

-

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-

-                $img_arr['title'] = ''; // add the title to the array

-            }

-        }

-

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

-    }

+			$img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+			$img_arr['path'] = $uploads_path . '/' . $file_name;

+			$width = 0;

+			$height = 0;

+			if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+				$imagesize = getimagesize($img_arr['path']);

+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

+			$img_arr['width'] = $width;

+			$img_arr['height'] = $height;

+			$img_arr['title'] = '';

+		} elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

+			foreach ($post_images as $image) {

+				return $image;

+			}

+		} else if ($no_image) {

+			$img_arr = array();

+

+			$default_img = '';

+			if (isset($post->default_category) && $post->default_category) {

+				$default_cat = $post->default_category;

+			} else {

+				$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			}

+

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_image) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

+				$uploads = wp_upload_dir(); // Array of key => value pairs

+				$uploads_baseurl = $uploads['baseurl'];

+				$uploads_path = $uploads['path'];

+

+				$img_arr = array();

+

+				$file_info = pathinfo($default_img);

+

+				$file_name = $file_info['basename'];

+

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+

+				$img_arr['title'] = ''; // add the title to the array

+			}

+		}

+

+		if (!empty($img_arr))

+			return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+		else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_show_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

-    {

-        $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

-

-        $html = geodir_show_image($image, $size, $no_image, false);

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

+	{

+		$image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

+

+		$html = geodir_show_image($image, $size, $no_image, false);

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_get_images')) {

-    /**

-     * Gets the post images.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param int $post_id The post ID.

-     * @param string $img_size Optional. Thumbnail size.

-     * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

-     * @param int|string $limit Optional. Number of images.

-     * @return array|bool Returns images as an array. Each item is an object.

-     */

-    function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

-    {

-        global $wpdb;

-        if ($limit) {

-            $limit_q = " LIMIT $limit ";

-        } else {

-            $limit_q = '';

-        }

-        $not_featured = '';

-        $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

-                array('%image%', $post_id)

-            )

-        );

-

-        $counter = 0;

-        $return_arr = array();

-

-        if (!empty($arrImages)) {

-            foreach ($arrImages as $attechment) {

-

-                $img_arr = array();

-                $img_arr['id'] = $attechment->ID;

-                $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

-

-                $file_info = pathinfo($attechment->file);

-

-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                    $sub_dir = stripslashes_deep($file_info['dirname']);

-

-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-                $uploads_baseurl = $uploads['baseurl'];

-                $uploads_path = $uploads['path'];

-

-                $file_name = $file_info['basename'];

-

-                $uploads_url = $uploads_baseurl . $sub_dir;

-                /*

+	/**

+	 * Gets the post images.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param int $post_id The post ID.

+	 * @param string $img_size Optional. Thumbnail size.

+	 * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

+	 * @param int|string $limit Optional. Number of images.

+	 * @return array|bool Returns images as an array. Each item is an object.

+	 */

+	function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

+	{

+		global $wpdb;

+		if ($limit) {

+			$limit_q = " LIMIT $limit ";

+		} else {

+			$limit_q = '';

+		}

+		$not_featured = '';

+		$sub_dir = '';

+		if (!$add_featured)

+			$not_featured = " AND is_featured = 0 ";

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+				array('%image%', $post_id)

+			)

+		);

+

+		$counter = 0;

+		$return_arr = array();

+

+		if (!empty($arrImages)) {

+			foreach ($arrImages as $attechment) {

+

+				$img_arr = array();

+				$img_arr['id'] = $attechment->ID;

+				$img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

+

+				$file_info = pathinfo($attechment->file);

+

+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+					$sub_dir = stripslashes_deep($file_info['dirname']);

+

+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+				$uploads_baseurl = $uploads['baseurl'];

+				$uploads_path = $uploads['path'];

+

+				$file_name = $file_info['basename'];

+

+				$uploads_url = $uploads_baseurl . $sub_dir;

+				/*

                 * Allows the filter of image src for such things as CDN change.

                 *

                 * @since 1.5.7

@@ -1471,516 +1471,516 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $attechment->title; // add the title to the array

-                $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

-                $img_arr['content'] = $attechment->content; // add the description to the array

-                $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

-

-                $return_arr[] = (object)$img_arr;

-

-                $counter++;

-            }

-            return (object)$return_arr;

-        } else if ($no_images) {

-            $default_img = '';

-            $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

-                $uploads = wp_upload_dir(); // Array of key => value pairs

+				$img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $attechment->title; // add the title to the array

+				$img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

+				$img_arr['content'] = $attechment->content; // add the description to the array

+				$img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

+

+				$return_arr[] = (object)$img_arr;

+

+				$counter++;

+			}

+			return (object)$return_arr;

+		} else if ($no_images) {

+			$default_img = '';

+			$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			$post_type = get_post_type($post_id);

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_images) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

+				$uploads = wp_upload_dir(); // Array of key => value pairs

                 

-                $image_path = $default_img;

-                if (!path_is_absolute($image_path)) {

-                    $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

-                }

-

-                $file_info = pathinfo($default_img);

-                $file_name = $file_info['basename'];

-

-                $width = '';

-                $height = '';

-                if (is_file($image_path) && file_exists($image_path)) {

-                    $imagesize = getimagesize($image_path);

-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

+				$image_path = $default_img;

+				if (!path_is_absolute($image_path)) {

+					$image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

+				}

+

+				$file_info = pathinfo($default_img);

+				$file_name = $file_info['basename'];

+

+				$width = '';

+				$height = '';

+				if (is_file($image_path) && file_exists($image_path)) {

+					$imagesize = getimagesize($image_path);

+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

                 

-                $img_arr = array();

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $image_path;

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $file_info['filename']; // add the title to the array

-                $img_arr['content'] = $file_info['filename']; // add the description to the array

-

-                $return_arr[] = (object)$img_arr;

-

-                return $return_arr;

-            } else

-                return false;

-        }

-    }

+				$img_arr = array();

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $image_path;

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $file_info['filename']; // add the title to the array

+				$img_arr['content'] = $file_info['filename']; // add the description to the array

+

+				$return_arr[] = (object)$img_arr;

+

+				return $return_arr;

+			} else

+				return false;

+		}

+	}

 }

 

 if (!function_exists('geodir_show_image')) {

-    /**

-     * Show image using image details.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array|object $request Image info either as an array or object.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

-    {

-        $image = new stdClass();

-

-        $html = '';

-        if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

-            }

-

-            if (isset($request->src) && !isset($request->path)) {

-                $request->path = $request->src;

-            }

-

-            /*

+	/**

+	 * Show image using image details.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array|object $request Image info either as an array or object.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

+	{

+		$image = new stdClass();

+

+		$html = '';

+		if (!empty($request)) {

+			if (!is_object($request)){

+				$request = (object)$request;

+			}

+

+			if (isset($request->src) && !isset($request->path)) {

+				$request->path = $request->src;

+			}

+

+			/*

              * getimagesize() works faster from path than url so we try and get path if we can.

              */

-            $upload_dir = wp_upload_dir();

-            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

-            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

-            if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

-            }

+			$upload_dir = wp_upload_dir();

+			$img_no_http = str_replace(array("http://", "https://"), "", $request->path);

+			$upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

+			if (strpos($img_no_http, $upload_no_http) !== false) {

+				$request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+			}

             

-            $width = 0;

-            $height = 0;

-            if (is_file($request->path) && file_exists($request->path)) {

-                $imagesize = getimagesize($request->path);

-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

-

-            $image->src = $request->src;

-            $image->width = $width;

-            $image->height = $height;

-

-            $max_size = (object)geodir_get_imagesize($size);

-

-            if (!is_wp_error($max_size)) {

-                if ($image->width) {

-                    if ($image->height >= $image->width) {

-                        $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

-                    } else if ($image->width < ($max_size->h)) {

-                        $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

-                }

-

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

-                } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

-                        //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                        //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

-

-                    }

-

-                }

-            }

-        }

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

-}

+			$width = 0;

+			$height = 0;

+			if (is_file($request->path) && file_exists($request->path)) {

+				$imagesize = getimagesize($request->path);

+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

 

-if (!function_exists('geodir_set_post_terms')) {

-    /**

-     * Set post Categories.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param array $terms An array of term objects.

-     * @param array $tt_ids An array of term taxonomy IDs.

-     * @param string $taxonomy Taxonomy slug.

-     */

-    function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

-    {

-        global $wpdb, $plugin_prefix;

+			$image->src = $request->src;

+			$image->width = $width;

+			$image->height = $height;

 

-        $post_type = get_post_type($post_id);

+			$max_size = (object)geodir_get_imagesize($size);

 

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

+			if (!is_wp_error($max_size)) {

+				if ($image->width) {

+					if ($image->height >= $image->width) {

+						$width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

+					} else if ($image->width < ($max_size->h)) {

+						$width_per = round((($image->width / $max_size->w) * 100), 2);

+					} else

+						$width_per = 100;

+				}

 

-        if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+				if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

+					$html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+				} else {

+					if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

+						$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+					}else{

+						//$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+						//$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

+						$html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+

+					}

+

+				}

+			}

+		}

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

+}

 

-            if ($taxonomy == $post_type . '_tags') {

-                if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-                    geodir_save_post_meta($post_id, 'post_tags', $terms);

-                }

-            } elseif ($taxonomy == $post_type . 'category') {

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

-                $replarr = array("&quot;", '');

+if (!function_exists('geodir_set_post_terms')) {

+	/**

+	 * Set post Categories.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param array $terms An array of term objects.

+	 * @param array $tt_ids An array of term taxonomy IDs.

+	 * @param string $taxonomy Taxonomy slug.

+	 */

+	function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+

+			if ($taxonomy == $post_type . '_tags') {

+				if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+					geodir_save_post_meta($post_id, 'post_tags', $terms);

+				}

+			} elseif ($taxonomy == $post_type . 'category') {

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

+				$replarr = array("&quot;", '');

 

-                $post_obj = get_post($post_id);

+				$post_obj = get_post($post_id);

 

-                $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+				$cat_ids = array('0');

+				if (is_array($tt_ids))

+					$cat_ids = $tt_ids;

 

 

-                if (!empty($cat_ids)) {

-                    $cat_ids_array = $cat_ids;

-                    $cat_ids_length = count($cat_ids_array);

-                    $cat_ids_format = array_fill(0, $cat_ids_length, '%d');

-                    $format = implode(',', $cat_ids_format);

+				if (!empty($cat_ids)) {

+					$cat_ids_array = $cat_ids;

+					$cat_ids_length = count($cat_ids_array);

+					$cat_ids_format = array_fill(0, $cat_ids_length, '%d');

+					$format = implode(',', $cat_ids_format);

 

-                    $cat_ids_array_del = $cat_ids_array;

-                    $cat_ids_array_del[] = $post_id;

+					$cat_ids_array_del = $cat_ids_array;

+					$cat_ids_array_del[] = $post_id;

 

-                    $wpdb->get_var(

-                        $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

-                            $cat_ids_array_del

-                        )

-                    );

+					$wpdb->get_var(

+						$wpdb->prepare(

+							"DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+							$cat_ids_array_del

+						)

+					);

 

 

-                    $post_term = $wpdb->get_col(

-                        $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

-                            $cat_ids_array

-                        )

-                    );

+					$post_term = $wpdb->get_col(

+						$wpdb->prepare(

+							"SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+							$cat_ids_array

+						)

+					);

 

-                }

+				}

 

-                $post_marker_json = '';

+				$post_marker_json = '';

 

-                if (!empty($post_term)):

+				if (!empty($post_term)):

 

-                    foreach ($post_term as $cat_id):

+					foreach ($post_term as $cat_id):

 

-                        $term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

-                        $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

+						$term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

+						$term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

 

-                        $post_title = $post_obj->title;

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

+						$post_title = $post_obj->title;

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

 

-                        $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

-                        $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

+						$lat = geodir_get_post_meta($post_id, 'post_latitude', true);

+						$lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+						$timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+						$timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

 

-                        $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

-                        $json .= '}';

+						$json = '{';

+						$json .= '"id":"' . $post_id . '",';

+						$json .= '"lat_pos": "' . $lat . '",';

+						$json .= '"long_pos": "' . $lng . '",';

+						$json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

+						$json .= '"icon":"' . $term_icon . '",';

+						$json .= '"group":"catgroup' . $cat_id . '"';

+						$json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+						if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

+							$post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+						if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

-                                array($post_title, $json, $post_id, $cat_id));

+								array($post_title, $json, $post_id, $cat_id));

 

-                        } else {

+						} else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

 										json = %s",

-                                array($post_id, $post_title, $cat_id, $json));

+								array($post_id, $post_title, $cat_id, $json));

 

-                        }

+						}

 

-                        $wpdb->query($json_query);

+						$wpdb->query($json_query);

 

-                    endforeach;

+					endforeach;

 

-                endif;

+				endif;

 

-                if (!empty($post_term) && is_array($post_term)) {

-                    $categories = implode(',', $post_term);

+				if (!empty($post_term) && is_array($post_term)) {

+					$categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+					if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+					if (empty($post_marker_json))

+						$post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+					if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "UPDATE " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"UPDATE " . $table . " SET

 								" . $taxonomy . " = %s,

 								marker_json = %s

 								where post_id = %d",

-                                array($categories, $post_marker_json, $post_id)

-                            )

-                        );

+								array($categories, $post_marker_json, $post_id)

+							)

+						);

 

-                        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

+						if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

 

-                            $categories = trim($categories, ',');

+							$categories = trim($categories, ',');

 

-                            if ($categories) {

+							if ($categories) {

 

-                                $categories = explode(',', $categories);

+								$categories = explode(',', $categories);

 

-                                $default_category = geodir_get_post_meta($post_id, 'default_category', true);

+								$default_category = geodir_get_post_meta($post_id, 'default_category', true);

 

-                                if (!in_array($default_category, $categories)) {

+								if (!in_array($default_category, $categories)) {

 

-                                    $wpdb->query(

-                                        $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+									$wpdb->query(

+										$wpdb->prepare(

+											"UPDATE " . $table . " SET

 											default_category = %s

 											where post_id = %d",

-                                            array($categories[0], $post_id)

-                                        )

-                                    );

+											array($categories[0], $post_id)

+										)

+									);

 

-                                    $default_category = $categories[0];

+									$default_category = $categories[0];

 

-                                }

+								}

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+								if ($default_category == '')

+									$default_category = $categories[0];

 

-                                geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

+								geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

-                            }

+							}

 

-                        }

+						}

 

 

-                    } else {

+					} else {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"INSERT INTO " . $table . " SET

 								post_id = %d,

 								" . $taxonomy . " = %s,

 								marker_json = %s ",

 

-                                array($post_id, $categories, $post_marker_json)

-                            )

-                        );

-                    }

-                }

-            }

-        }

-    }

+								array($post_id, $categories, $post_marker_json)

+							)

+						);

+					}

+				}

+			}

+		}

+	}

 }

 

 if (!function_exists('geodir_get_infowindow_html')) {

-    /**

-     * Set post Map Marker info html.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

-     * @package GeoDirectory

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param object $postinfo_obj The post details object.

-     * @param string $post_preview Is this a post preview?.

-     * @return mixed|string|void

-     */

-    function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

-    {

-        global $preview, $gd_session;

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

-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

-

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

-            $ID = '';

-            $plink = '';

-

-            if (isset($postinfo_obj->pid)) {

-                $ID = $postinfo_obj->pid;

-                $plink = get_permalink($ID);

-            }

-

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

-            $lat = $postinfo_obj->post_latitude;

-            $lng = $postinfo_obj->post_longitude;

-        } else {

-            $ID = $postinfo_obj->post_id;

-            $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

-            $plink = get_permalink($ID);

-            $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

-            $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

-        }

-

-        // filter field as per price package

-        global $geodir_addon_list;

-        if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

-            $post_type = get_post_type($ID);

-            $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

-            $field_name = 'geodir_contact';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $contact = '';

-            }

-

-            $field_name = 'geodir_timing';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $timing = '';

-            }

-        }

-

-        if ($lat && $lng) {

-            ob_start(); ?>

+	/**

+	 * Set post Map Marker info html.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

+	 * @package GeoDirectory

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param object $postinfo_obj The post details object.

+	 * @param string $post_preview Is this a post preview?.

+	 * @return mixed|string|void

+	 */

+	function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

+	{

+		global $preview, $gd_session;

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

+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

+

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

+			$ID = '';

+			$plink = '';

+

+			if (isset($postinfo_obj->pid)) {

+				$ID = $postinfo_obj->pid;

+				$plink = get_permalink($ID);

+			}

+

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

+			$lat = $postinfo_obj->post_latitude;

+			$lng = $postinfo_obj->post_longitude;

+		} else {

+			$ID = $postinfo_obj->post_id;

+			$title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

+			$plink = get_permalink($ID);

+			$lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

+			$lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

+		}

+

+		// filter field as per price package

+		global $geodir_addon_list;

+		if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

+			$post_type = get_post_type($ID);

+			$package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

+			$field_name = 'geodir_contact';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$contact = '';

+			}

+

+			$field_name = 'geodir_timing';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$timing = '';

+			}

+		}

+

+		if ($lat && $lng) {

+			ob_start(); ?>

             <div class="gd-bubble" style="">

                 <div class="gd-bubble-inside">

                     <?php

-                    $comment_count = '';

-                    $rating_star = '';

-                    if ($ID != '') {

-                        $rating_star = '';

-                        $comment_count = geodir_get_review_count_total($ID);

-

-                        if (!$preview) {

-                            $post_avgratings = geodir_get_post_rating($ID);

-

-                            $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

-

-                            /**

-                             * Filter to change rating stars

-                             *

-                             * You can use this filter to change Rating stars.

-                             *

-                             * @since 1.0.0

-                             * @package GeoDirectory

-                             * @param string $rating_star Rating stars.

-                             * @param float $post_avgratings Average ratings of the post.

-                             * @param int $ID The post ID.

-                             */

-                            $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

-                        }

-                    }

-                    ?>

+					$comment_count = '';

+					$rating_star = '';

+					if ($ID != '') {

+						$rating_star = '';

+						$comment_count = geodir_get_review_count_total($ID);

+

+						if (!$preview) {

+							$post_avgratings = geodir_get_post_rating($ID);

+

+							$rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

+

+							/**

+							 * Filter to change rating stars

+							 *

+							 * You can use this filter to change Rating stars.

+							 *

+							 * @since 1.0.0

+							 * @package GeoDirectory

+							 * @param string $rating_star Rating stars.

+							 * @param float $post_avgratings Average ratings of the post.

+							 * @param int $ID The post ID.

+							 */

+							$rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

+						}

+					}

+					?>

                     <div class="geodir-bubble_desc">

                         <h4>

                             <a href="<?php if ($plink != '') {

-                                echo $plink;

-                            } else {

-                                echo 'javascript:void(0);';

-                            } ?>"><?php echo $title; ?></a>

+								echo $plink;

+							} else {

+								echo 'javascript:void(0);';

+							} ?>"><?php echo $title; ?></a>

                         </h4>

                         <?php

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

-                            $post_images = array();

-                            if (!empty($postinfo_obj->post_images)) {

-                                $post_images = explode(",", $postinfo_obj->post_images);

-                            }

-

-                            if (!empty($post_images)) {

-                                ?>

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

+							$post_images = array();

+							if (!empty($postinfo_obj->post_images)) {

+								$post_images = explode(",", $postinfo_obj->post_images);

+							}

+

+							if (!empty($post_images)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {

-                                        echo $plink;

-                                    } else {

-                                        echo 'javascript:void(0);';

-                                    } ?>"><img alt="bubble image" style="max-height:50px;"

+										echo $plink;

+									} else {

+										echo 'javascript:void(0);';

+									} ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        } else {

-                            if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

-                                ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						} else {

+							if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        }

-                        ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						}

+						?>

                         <div class="geodir-bubble-meta-side">

                             <?php

-                            /**

-                             * Fires before the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window before the normal meta info.

-                             *

-                             * @since 1.5.4

-                             * @param int $ID The post id.

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

-

-

-                            echo geodir_show_listing_info('mapbubble');

+							/**

+							 * Fires before the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window before the normal meta info.

+							 *

+							 * @since 1.5.4

+							 * @param int $ID The post id.

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

+

+

+							echo geodir_show_listing_info('mapbubble');

                             

                                                       

 

-                            /**

-                             * Fires after the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window after the normal meta info.

-                             *

-                             * @since 1.4.2

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

-                            ?>

+							/**

+							 * Fires after the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window after the normal meta info.

+							 *

+							 * @since 1.4.2

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+							?>

                         </div>

                         <?php

 

-                        if ($ID) {

+						if ($ID) {

 

-                            $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

-                            ?>

+							$post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

+							?>

                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

@@ -2000,69 +2000,69 @@ 
                 </div>

             </div>

             <?php

-            $html = ob_get_clean();

-            /**

-             * Filter to change infowindow html

-             *

-             * You can use this filter to change infowindow html.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param string $html Infowindow html.

-             * @param object $postinfo_obj The Post object.

-             * @param bool|string $post_preview Is this a post preview?

-             */

-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

-            return $html;

-        }

-    }

+			$html = ob_get_clean();

+			/**

+			 * Filter to change infowindow html

+			 *

+			 * You can use this filter to change infowindow html.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param string $html Infowindow html.

+			 * @param object $postinfo_obj The Post object.

+			 * @param bool|string $post_preview Is this a post preview?

+			 */

+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

+			return $html;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_new_post_default_status')) {

-    /**

-     * Default post status for new posts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Returns the default post status for new posts. Ex: draft, publish etc.

-     */

-    function geodir_new_post_default_status()

-    {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

-

-    }

+	/**

+	 * Default post status for new posts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Returns the default post status for new posts. Ex: draft, publish etc.

+	 */

+	function geodir_new_post_default_status()

+	{

+		if (get_option('geodir_new_post_default_status'))

+			return get_option('geodir_new_post_default_status');

+		else

+			return 'publish';

+

+	}

 }

 

 if (!function_exists('geodir_change_post_status')) {

-    /**

-     * Change post status of a post.

-     *

-     * @global object $wpdb WordPress Database object.

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

-     * @param int|string $post_id The post ID.

-     * @param string $status New post status. Ex: draft, publish etc.

-     */

-    function geodir_change_post_status($post_id = '', $status = '')

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

-                array($status, $post_id)

-            )

-        );

-

-

-    }

+	/**

+	 * Change post status of a post.

+	 *

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int|string $post_id The post ID.

+	 * @param string $status New post status. Ex: draft, publish etc.

+	 */

+	function geodir_change_post_status($post_id = '', $status = '')

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+				array($status, $post_id)

+			)

+		);

+

+

+	}

 }

 

 /**

@@ -2076,13 +2076,13 @@ 
  */

 function geodir_set_post_status($pid, $status)

 {

-    if ($pid) {

-        global $wpdb;

-        $my_post = array();

-        $my_post['post_status'] = $status;

-        $my_post['ID'] = $pid;

-        $last_postid = wp_update_post($my_post);

-    }

+	if ($pid) {

+		global $wpdb;

+		$my_post = array();

+		$my_post['post_status'] = $status;

+		$my_post['ID'] = $pid;

+		$last_postid = wp_update_post($my_post);

+	}

 }

 

 

@@ -2098,384 +2098,384 @@ 
  */

 function geodir_update_poststatus($new_status, $old_status, $post)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {

+	if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {

 

-        geodir_change_post_status($post->ID, $new_status);

-    }

+		geodir_change_post_status($post->ID, $new_status);

+	}

 }

 

 

 if (!function_exists('geodir_update_listing_info')) {

-    /**

-     * Update post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $updatingpost The updating post ID.

-     * @param int $temppost The temporary post ID.

-     * @todo fix post_id variable

-     */

-    function geodir_update_listing_info($updatingpost, $temppost)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        /* Update Attachments*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-    }

+	/**

+	 * Update post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $updatingpost The updating post ID.

+	 * @param int $temppost The temporary post ID.

+	 * @todo fix post_id variable

+	 */

+	function geodir_update_listing_info($updatingpost, $temppost)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		/* Update Attachments*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+	}

 }

 

 

 if (!function_exists('geodir_delete_listing_info')) {

-    /**

-     * Delete Listing info from details table for the given post id.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $deleted_postid The post ID.

-     * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

-     */

-    function geodir_delete_listing_info($deleted_postid, $force = false)

-    {

-        global $wpdb, $plugin_prefix;

-

-        // check for multisite deletions

-        if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

-        } else {

-            return;

-        }

-

-        $post_type = get_post_type($deleted_postid);

-

-        $all_postypes = geodir_get_posttypes();

-

-        if (!in_array($post_type, $all_postypes))

-            return false;

-

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

-

-        /* Delete custom post meta*/

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete post map icons*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete Attachments*/

-        $postcurr_images = geodir_get_images($deleted_postid);

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-        geodir_remove_attachments($postcurr_images);

-

-    }

+	/**

+	 * Delete Listing info from details table for the given post id.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $deleted_postid The post ID.

+	 * @param bool $force Optional. Do you want to force delete it? Default: false.

+	 * @return bool|void

+	 */

+	function geodir_delete_listing_info($deleted_postid, $force = false)

+	{

+		global $wpdb, $plugin_prefix;

+

+		// check for multisite deletions

+		if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

+		} else {

+			return;

+		}

+

+		$post_type = get_post_type($deleted_postid);

+

+		$all_postypes = geodir_get_posttypes();

+

+		if (!in_array($post_type, $all_postypes))

+			return false;

+

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

+

+		/* Delete custom post meta*/

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . $table . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete post map icons*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete Attachments*/

+		$postcurr_images = geodir_get_images($deleted_postid);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+		geodir_remove_attachments($postcurr_images);

+

+	}

 }

 

 

 if (!function_exists('geodir_add_to_favorite')) {

-    /**

-     * This function would add listing to favorite listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_add_to_favorite($post_id)

-    {

-

-        global $current_user;

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+	/**

+	 * This function would add listing to favorite listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_add_to_favorite($post_id)

+	{

+

+		global $current_user;

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

+			$user_meta_data[] = $post_id;

+		}

+

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+

+		/**

+		 * Called before adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_add_from_favorite', $post_id);

+

+		echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+

+		/**

+		 * Called after adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_add_from_favorite', $post_id);

 

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

-            $user_meta_data[] = $post_id;

-        }

-

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

-

-        /**

-         * Called before adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_add_from_favorite', $post_id);

-

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

-

-        /**

-         * Called after adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_add_from_favorite', $post_id);

-

-    }

+	}

 }

 

 if (!function_exists('geodir_remove_from_favorite')) {

-    /**

-     * This function would remove the favourited property earlier.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_remove_from_favorite($post_id)

-    {

-        global $current_user;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data)) {

+	/**

+	 * This function would remove the favourited property earlier.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_remove_from_favorite($post_id)

+	{

+		global $current_user;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data)) {

+

+			if (($key = array_search($post_id, $user_meta_data)) !== false) {

+				unset($user_meta_data[$key]);

+			}

 

-            if (($key = array_search($post_id, $user_meta_data)) !== false) {

-                unset($user_meta_data[$key]);

-            }

+		}

 

-        }

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

 

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+		/**

+		 * Called before removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_remove_from_favorite', $post_id);

 

-        /**

-         * Called before removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_remove_from_favorite', $post_id);

+		echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+		/**

+		 * Called after removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_remove_from_favorite', $post_id);

 

-        /**

-         * Called after removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_remove_from_favorite', $post_id);

-

-    }

+	}

 }

 

 if (!function_exists('geodir_favourite_html')) {

-    /**

-     * This function would display the html content for add to favorite or remove from favorite.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @global object $post The current post object.

-     * @param int $user_id The user ID.

-     * @param int $post_id The post ID.

-     */

-    function geodir_favourite_html($user_id, $post_id)

-    {

-

-        global $current_user, $post;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        /**

-         * Filter to modify "fa fa-heart" icon for "remove from favorites" link

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

-

-        $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+	/**

+	 * This function would display the html content for add to favorite or remove from favorite.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @global object $post The current post object.

+	 * @param int $user_id The user ID.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_favourite_html($user_id, $post_id)

+	{

+

+		global $current_user, $post;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		/**

+		 * Filter to modify "fa fa-heart" icon for "remove from favorites" link

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

+

+		$user_meta_data = '';

+		if (isset($current_user->data->ID))

+			$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

                 onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

                 title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

             </a>   </span><?php

 

-        } else {

+		} else {

 

-            if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+			if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

+				$script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+			} else

+				$script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

                                                                                         onclick="<?php echo $script_text;?>"

                                                                                         title="<?php echo $add_favourite_text;?>"><i

                     class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

         <?php }

-    }

+	}

 }

 

 

@@ -2492,54 +2492,54 @@ 
 function geodir_get_cat_postcount($term = array())

 {

 

-    if (!empty($term)) {

+	if (!empty($term)) {

 

-        global $wpdb, $plugin_prefix;

+		global $wpdb, $plugin_prefix;

 

-        $where = '';

-        $join = '';

-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

-            $taxonomy_obj = get_taxonomy($term->taxonomy);

+		$where = '';

+		$join = '';

+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

+			$taxonomy_obj = get_taxonomy($term->taxonomy);

 

-            $post_type = $taxonomy_obj->object_type[0];

+			$post_type = $taxonomy_obj->object_type[0];

 

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

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

 

-            /**

-             * Filter to modify the 'join' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $join The join query.

-             */

-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);

+			/**

+			 * Filter to modify the 'join' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $join The join query.

+			 */

+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);

 

-            /**

-             * Filter to modify the 'where' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $where The where query.

-             */

-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);

+			/**

+			 * Filter to modify the 'where' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $where The where query.

+			 */

+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

-            $count_query = "SELECT count(post_id) FROM

+			$count_query = "SELECT count(post_id) FROM

 							" . $table . " as pd " . $join . "

 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

-            $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+			$cat_post_count = $wpdb->get_var($count_query);

+			if (empty($cat_post_count) || is_wp_error($cat_post_count))

+				$cat_post_count = 0;

 

-            return $cat_post_count;

+			return $cat_post_count;

 

-        } else

+		} else

 

-            return $term->count;

-    }

-    return false;

+			return $term->count;

+	}

+	return false;

 

 }

 

@@ -2552,17 +2552,17 @@ 
  */

 function geodir_allow_post_type_frontend()

 {

-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

 

-    if (!is_admin() && isset($_REQUEST['listing_type'])

-        && !empty($geodir_allow_posttype_frontend)

-        && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)

-    ) {

+	if (!is_admin() && isset($_REQUEST['listing_type'])

+		&& !empty($geodir_allow_posttype_frontend)

+		&& !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)

+	) {

 

-        wp_redirect(home_url());

-        exit;

+		wp_redirect(home_url());

+		exit;

 

-    }

+	}

 

 }

 

@@ -2579,20 +2579,20 @@ 
  */

 function geodir_excerpt_length($length)

 {

-    global $wp_query, $geodir_is_widget_listing;

+	global $wp_query, $geodir_is_widget_listing;

 	if ($geodir_is_widget_listing) {

 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

+		$length = get_option('geodir_desc_word_limit');

+	elseif (get_query_var('excerpt_length'))

+		$length = get_query_var('excerpt_length');

 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

+		$length = get_option('geodir_author_desc_word_limit');

 

-    return $length;

+	return $length;

 }

 

 /**

@@ -2607,13 +2607,13 @@ 
  */

 function geodir_excerpt_more($more)

 {

-    global $post;

-    $all_postypes = geodir_get_posttypes();

-    if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

-    }

+	global $post;

+	$all_postypes = geodir_get_posttypes();

+	if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

+		return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+	}

 

-    return $more;

+	return $more;

 }

 

 

@@ -2630,63 +2630,63 @@ 
  */

 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)

 {

-    global $plugin_prefix, $wpdb;

+	global $plugin_prefix, $wpdb;

 

-    $gd_taxonomies = geodir_get_taxonomies();

+	$gd_taxonomies = geodir_get_taxonomies();

 

-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

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

+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

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

 

-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

 

-        $posts = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

-                array($term_id, $taxonomy)

-            )

-        );

+		$posts = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+				array($term_id, $taxonomy)

+			)

+		);

 

-        if (!empty($posts)):

-            foreach ($posts as $post_obj) {

+		if (!empty($posts)):

+			foreach ($posts as $post_obj) {

 

-                $lat = $post_obj->post_latitude;

-                $lng = $post_obj->post_longitude;

+				$lat = $post_obj->post_latitude;

+				$lng = $post_obj->post_longitude;

 

-                $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

-                $json .= '}';

+				$json = '{';

+				$json .= '"id":"' . $post_obj->post_id . '",';

+				$json .= '"lat_pos": "' . $lat . '",';

+				$json .= '"long_pos": "' . $lng . '",';

+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

+				$json .= '"icon":"' . $term_icon . '",';

+				$json .= '"group":"catgroup' . $term_id . '"';

+				$json .= '}';

 

-                if ($post_obj->default_category == $term_id) {

+				if ($post_obj->default_category == $term_id) {

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

-                            array($json, $post_obj->post_id)

-                        )

-                    );

-                }

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+							array($json, $post_obj->post_id)

+						)

+					);

+				}

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

-                        array($json, $post_obj->post_id, $term_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+						array($json, $post_obj->post_id, $term_id)

+					)

+				);

 

-            }

+			}

 

 

-        endif;

+		endif;

 

-    }

+	}

 

 }

 

@@ -2700,14 +2700,14 @@ 
  */

 function geodir_get_listing_author($listing_id = '')

 {

-    if ($listing_id == '') {

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

-            $listing_id = $_REQUEST['pid'];

-        }

-    }

-    $listing = get_post(strip_tags($listing_id));

-    $listing_author_id = $listing->post_author;

-    return $listing_author_id;

+	if ($listing_id == '') {

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

+			$listing_id = $_REQUEST['pid'];

+		}

+	}

+	$listing = get_post(strip_tags($listing_id));

+	$listing_author_id = $listing->post_author;

+	return $listing_author_id;

 }

 

 

@@ -2722,11 +2722,11 @@ 
  */

 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

-    $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+	$listing_author_id = geodir_get_listing_author($listing_id);

+	if ($listing_author_id == $user_id)

+		return true;

+	else

+		return false;

 

 }

 

@@ -2742,17 +2742,17 @@ 
  */

 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)

 {

-    global $current_user;

-    if ($exclude_admin) {

-        foreach ($current_user->caps as $key => $caps) {

-            if (geodir_strtolower($key) == 'administrator') {

-                return true;

-                break;

-            }

-        }

-    }

-

-    return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

+	global $current_user;

+	if ($exclude_admin) {

+		foreach ($current_user->caps as $key => $caps) {

+			if (geodir_strtolower($key) == 'administrator') {

+				return true;

+				break;

+			}

+		}

+	}

+

+	return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

 }

 

 

@@ -2768,17 +2768,17 @@ 
 function geodir_only_supportable_attachments_remove($file)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $matches = array();

+	$matches = array();

 

-    $pattern = '/-\d+x\d+\./';

-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

+	$pattern = '/-\d+x\d+\./';

+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+	if (empty($matches))

+		return '';

+	else

+		return $file;

 

 }

 

@@ -2795,78 +2795,78 @@ 
 function geodir_set_wp_featured_image($post_id)

 {

 

-    global $wpdb, $plugin_prefix;

-    $uploads = wp_upload_dir();

+	global $wpdb, $plugin_prefix;

+	$uploads = wp_upload_dir();

 //	print_r($uploads ) ;

-    $post_first_image = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

-        )

-    );

+	$post_first_image = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+		)

+	);

 

-    $old_attachment_name = '';

-    $post_thumbnail_id = '';

-    if (has_post_thumbnail($post_id)) {

+	$old_attachment_name = '';

+	$post_thumbnail_id = '';

+	if (has_post_thumbnail($post_id)) {

 

-        if (has_post_thumbnail($post_id)) {

+		if (has_post_thumbnail($post_id)) {

 

-            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+			$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));

+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));

 

-        }

-    }

-

-    if (!empty($post_first_image)) {

+		}

+	}

 

-        $post_type = get_post_type($post_id);

+	if (!empty($post_first_image)) {

 

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

+		$post_type = get_post_type($post_id);

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

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

 

-        $new_attachment_name = basename($post_first_image[0]->file);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

 

-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

+		$new_attachment_name = basename($post_first_image[0]->file);

 

-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

 

-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

 

-                wp_delete_attachment($post_thumbnail_id);

+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

 

-            }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+				wp_delete_attachment($post_thumbnail_id);

 

-            $attachment = array(

-                'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

-                'post_parent' => $post_id,

-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

-                'post_content' => ''

-            );

+			}

+			$filename = $uploads['basedir'] . $post_first_image[0]->file;

+

+			$attachment = array(

+				'post_mime_type' => $post_first_image[0]->mime_type,

+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+				'post_parent' => $post_id,

+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

+				'post_content' => ''

+			);

 

 

-            $id = wp_insert_attachment($attachment, $filename, $post_id);

+			$id = wp_insert_attachment($attachment, $filename, $post_id);

 

-            if (!is_wp_error($id)) {

+			if (!is_wp_error($id)) {

 

-                set_post_thumbnail($post_id, $id);

+				set_post_thumbnail($post_id, $id);

 

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

-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

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

+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

-            }

+			}

 

-        }

+		}

 

-    } else {

-        //set_post_thumbnail($post_id,-1);

+	} else {

+		//set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

+			wp_delete_attachment($post_thumbnail_id);

 

-    }

+	}

 }

 

 

@@ -2881,53 +2881,53 @@ 
  */

 function gd_copy_original_translation()

 {

-    if (function_exists('icl_object_id')) {

-        global $wpdb, $table_prefix, $plugin_prefix;

-        $post_id = absint($_POST['post_id']);

-        $upload_dir = wp_upload_dir();

-        $post_type = get_post_type($_POST['post_id']);

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

-

-        $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

-            array($post_id)

-        )

-            , ARRAY_A);

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

-                array('%image%', $post_id)

-            )

-        );

-        if ($arrImages) {

-            $image_arr = array();

-            foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

-            }

-            $comma_separated = implode(",", $image_arr);

-            $post_arr[0]['post_images'] = $comma_separated;

-        }

-

-

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

-        $cat_arr = array_filter(explode(",", $cats));

-        $trans_cat = array();

-        foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

-        }

-

-

-        $post_arr[0]['categories'] = array_filter($trans_cat);

+	if (function_exists('icl_object_id')) {

+		global $wpdb, $table_prefix, $plugin_prefix;

+		$post_id = absint($_POST['post_id']);

+		$upload_dir = wp_upload_dir();

+		$post_type = get_post_type($_POST['post_id']);

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

+

+		$post_arr = $wpdb->get_results($wpdb->prepare(

+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+			array($post_id)

+		)

+			, ARRAY_A);

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+				array('%image%', $post_id)

+			)

+		);

+		if ($arrImages) {

+			$image_arr = array();

+			foreach ($arrImages as $img) {

+				$image_arr[] = $upload_dir['baseurl'] . $img->file;

+			}

+			$comma_separated = implode(",", $image_arr);

+			$post_arr[0]['post_images'] = $comma_separated;

+		}

+

+

+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+		$cat_arr = array_filter(explode(",", $cats));

+		$trans_cat = array();

+		foreach ($cat_arr as $cat) {

+			$trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+		}

+

+

+		$post_arr[0]['categories'] = array_filter($trans_cat);

 //print_r($image_arr);

-        //print_r($arrImages);

-        //echo $_REQUEST['lang'];

+		//print_r($arrImages);

+		//echo $_REQUEST['lang'];

 //print_r($post_arr);

 //print_r($trans_cat);

-        echo json_encode($post_arr[0]);

+		echo json_encode($post_arr[0]);

 

-    }

-    die();

+	}

+	die();

 }

 

 

@@ -2947,54 +2947,54 @@ 
 function geodir_get_custom_fields_type($listing_type = '')

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+	if ($listing_type == '')

+		$listing_type = 'gd_place';

 

-    $fields_info = array();

+	$fields_info = array();

 

-    $get_data = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

-            array($listing_type)

-        )

-    );

+	$get_data = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+			array($listing_type)

+		)

+	);

 

-    if (!empty($get_data)) {

+	if (!empty($get_data)) {

 

-        foreach ($get_data as $data) {

+		foreach ($get_data as $data) {

 

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

+			if ($data->field_type == 'address') {

 

-                $extra_fields = unserialize($data->extra_fields);

+				$extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+				$prefix = $data->htmlvar_name . '_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+				$fields_info[$prefix . 'address'] = $data->field_type;

 

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

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

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

+					$fields_info[$prefix . 'zip'] = $data->field_type;

 

-            } else {

+			} else {

 

-                $fields_info[$data->htmlvar_name] = $data->field_type;

+				$fields_info[$data->htmlvar_name] = $data->field_type;

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    /**

-     * Filter to modify custom fields info using listing post type.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return array $fields_info Custom fields info.

-     * @param string $listing_type The listing post type.

-     */

-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

+	/**

+	 * Filter to modify custom fields info using listing post type.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return array $fields_info Custom fields info.

+	 * @param string $listing_type The listing post type.

+	 */

+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

 }

 

 

@@ -3009,58 +3009,58 @@ 
  */

 function geodir_function_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

-        // send notification to client when post moves from draft to publish

-        if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

-            $post_author_data = get_userdata($post_author_id);

+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

+		// send notification to client when post moves from draft to publish

+		if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

+			$post_author_data = get_userdata($post_author_id);

 

-            $to_name = geodir_get_client_name($post_author_id);

+			$to_name = geodir_get_client_name($post_author_id);

 

-            $from_email = geodir_get_site_email_id();

-            $from_name = get_site_emailName();

-            $to_email = $post_author_data->user_email;

+			$from_email = geodir_get_site_email_id();

+			$from_name = get_site_emailName();

+			$to_email = $post_author_data->user_email;

 

-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {

-                $to_email = $post_author_data->user_email;

-            }

+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {

+				$to_email = $post_author_data->user_email;

+			}

 

-            $message_type = 'listing_published';

+			$message_type = 'listing_published';

 

-            if (get_option('geodir_post_published_email_subject') == '') {

-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_subject') == '') {

+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

+			}

 

-            if (get_option('geodir_post_published_email_content') == '') {

-                update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_content') == '') {

+				update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

+			}

 

-            /**

-             * Called before sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_before_listing_published_email', $post_after, $post_before);

-            if (is_email($to_email)) {

-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

-            }

+			/**

+			 * Called before sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_before_listing_published_email', $post_after, $post_before);

+			if (is_email($to_email)) {

+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

+			}

 

-            /**

-             * Called after sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_after_listing_published_email', $post_after, $post_before);

-        }

-    }

+			/**

+			 * Called after sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_after_listing_published_email', $post_after, $post_before);

+		}

+	}

 }

 

 add_action('wp_head', 'geodir_fb_like_thumbnail');

@@ -3074,14 +3074,14 @@ 
  */

 function geodir_fb_like_thumbnail(){

 

-    // return if not a single post

-    if(!is_single()){return;}

+	// return if not a single post

+	if(!is_single()){return;}

 

-    global $post;

-    if(isset($post->featured_image) && $post->featured_image){

-        $upload_dir = wp_upload_dir();

-        $thumb = $upload_dir['baseurl'].$post->featured_image;

-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

+	global $post;

+	if(isset($post->featured_image) && $post->featured_image){

+		$upload_dir = wp_upload_dir();

+		$thumb = $upload_dir['baseurl'].$post->featured_image;

+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

 

-    }

+	}

 }
\ No newline at end of file

Spacing +204 added lines, -204 removed lines

@@ -26,11 +26,11 @@ 
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

+    } else {

+        if (!is_int($default_cat)) {

             $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

+            if (isset($category->term_id)) {

+                $default_cat = $category->term_id;

             }

         }

 

@@ -58,7 +58,7 @@ 
 

     if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+        $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str);

 

     }

 

@@ -227,7 +227,7 @@ 
         $send_post_submit_mail = false;

 

         // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

+        remove_action('save_post', 'geodir_post_information_save', 10, 2);

 

         if (isset($request_info['pid']) && $request_info['pid'] != '') {

             $post['ID'] = $request_info['pid'];

@@ -251,13 +251,13 @@ 
         }

 

         // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+        add_action('save_post', 'geodir_post_information_save', 10, 2);

 

         $post_tags = '';

         if (!isset($request_info['post_tags'])) {

 

             $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));

 

         }

 

@@ -275,13 +275,13 @@ 
         $payment_info = array();

         $package_info = array();

 

-        $package_info = (array)geodir_post_package_info($package_info, $post);

+        $package_info = (array) geodir_post_package_info($package_info, $post);

 

         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

         if (!empty($package_info) && !$post_package_id) {

             if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+                $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));

             } else {

                 $payment_info['expire_date'] = 'Never';

             }

@@ -302,8 +302,8 @@ 
             $extrafields = $val['extra_fields'];

 

             if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+                $prefix = $name.'_';

+                $address = $prefix.'address';

 

                 if (isset($request_info[$address]) && $request_info[$address] != '') {

                     $gd_post_info[$address] = wp_slash($request_info[$address]);

@@ -313,59 +313,59 @@ 
                     $extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+                    if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {

 

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+                        $gd_post_info[$prefix.'city'] = $location_result->city;

+                        $gd_post_info[$prefix.'region'] = $location_result->region;

+                        $gd_post_info[$prefix.'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

 

                     } else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+                        $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city'];

+                        $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region'];

+                        $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country'];

 

                         //----------set post locations when import dummy data-------

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

                         //-----------------------------------------------------------------

 

                     }

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {

+                        $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip'];

                     }

 

 

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

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+                        if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {

+                            $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+                        if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {

+                            $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+                        if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {

+                            $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+                        if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {

+                            $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom'];

                         }

 

                     }

 

                     // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {

+                        $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng'];

                     }

                 }

 

@@ -390,16 +390,16 @@ 
 

                     // 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 5 then it's the old style format.

+                    if ($date_format_len > 5) {// if greater then 5 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' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

+                    } else {

                         $post_htmlvar_value = $request_info[$name];

                     }

 

@@ -414,7 +414,7 @@ 
                 if (isset($request_info[$name])) {

                     $gd_post_info[$name] = $request_info[$name];

                 } else {

-                    if (isset($request_info['gd_field_' . $name])) {

+                    if (isset($request_info['gd_field_'.$name])) {

                         $gd_post_info[$name] = ''; /* fix de-select for multiselect */

                     }

                 }

@@ -474,7 +474,7 @@ 
         }

 

         if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

+            $taxonomy = $request_info['listing_type'].'_tags';

             wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

         }

 

@@ -486,7 +486,7 @@ 
                 $tmpimgArr = trim($request_info['post_images'], ",");

                 $tmpimgArr = explode(",", $tmpimgArr);

                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

+            } else {

                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

             }

 

@@ -567,7 +567,7 @@ 
     if (!in_array($post_type, $all_postypes))

         return false;

 

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

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

 

     /**

      * Apply Filter to change Post info

@@ -577,7 +577,7 @@ 
      * @since 1.0.0

      * @package GeoDirectory

      */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

@@ -640,7 +640,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         /**

          * Filter to change Post info

@@ -663,7 +663,7 @@ 
                         $mval = implode(",", $mval);

                     }

 

-                    $post_meta_set_query .= $mkey . " = '" . addslashes_gpc($mval) . "', ";

+                    $post_meta_set_query .= $mkey." = '".addslashes_gpc($mval)."', ";

                 }

             }

 

@@ -673,7 +673,7 @@ 
                 return false;

             }

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query); // escape %

 

 

             /**

@@ -686,11 +686,11 @@ 
              */

             do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -700,7 +700,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+                        "INSERT INTO ".$table." SET post_id = %d,".$post_meta_set_query,

                         array($post_id)

                     )

                 );

@@ -746,7 +746,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

 

@@ -754,11 +754,11 @@ 
                 $meta_value = implode(",", $meta_value);

             }

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+                        "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -767,7 +767,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+                        "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'",

                         array($post_id)

                     )

                 );

@@ -800,14 +800,14 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (is_array($postmeta) && !empty($postmeta) && $post_id) {

             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

                 if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                    $post_meta_set_query .= $mkey." = '', ";

             }

 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

@@ -816,11 +816,11 @@ 
                 return false;

             }

 

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -829,11 +829,11 @@ 
             }

 

         } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+                        "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -875,10 +875,10 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {

+            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));

             

             if ($meta_value && $meta_value !== '') {

                 return maybe_serialize($meta_value);

@@ -912,13 +912,13 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $post_images = geodir_get_images($post_id);

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",

                 array($post_id)

             )

         );

@@ -948,12 +948,12 @@ 
                 $file_path = '';

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

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));

 

                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

                     /* --------- end ------- */

                     $curr_img_url = $post_image[$m];

@@ -997,7 +997,7 @@ 
                     // If the uploaded file is the right format

                     if (in_array($uploaded_file_type, $allowed_file_types)) {

                         if (!function_exists('wp_handle_upload')) {

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

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

                         }

 

                         if (!is_dir($geodir_uploadpath)) {

@@ -1005,41 +1005,41 @@ 
                         }

 

                         $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {

                         } else {

                             $external_img = true;

                         }

 

                         if ($dummy || $external_img) {

                             $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+                            $uploaded = (array) fetch_remote_file($curr_img_url);

 

                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

+                            } else {

+                                print_r($uploaded); exit;

                             }

                             $external_img = false;

                         } else {

-                            $new_name = $post_id . '_' . $file_name;

+                            $new_name = $post_id.'_'.$file_name;

 

                             if ($curr_img_dir == $sub_dir) {

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

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

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

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

                             } else {

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

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

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

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

                             }

 

                             $uploaded_file = '';

 

                             if (file_exists($img_path)) {

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

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

                                 $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+                            } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {

                                 $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

+                                $file_path = $curr_img_dir.'/'.$filename;

                             }

 

                             if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

@@ -1048,14 +1048,14 @@ 
 

                         if (!empty($uploaded_file)) {

                             if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

+                                $file_path = $sub_dir.'/'.$new_name;

                             }

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);

 

                             if ($menu_order == 1) {

 

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));

 

                             }

 

@@ -1073,12 +1073,12 @@ 
 

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

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

 

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             $valid_file_ids[] = $wpdb->insert_id;

                         }

@@ -1089,17 +1089,17 @@ 
                 } else {

                     $valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",

                             array($menu_order, $split_img_path[1], $post_id)

                         )

                     );

 

                     if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

                 }

 

@@ -1123,9 +1123,9 @@ 
 

                 foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {

 

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

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

 

                     }

 

@@ -1133,12 +1133,12 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));

 

         if (!empty($invalid_files))

             geodir_remove_attachments($invalid_files);

@@ -1178,7 +1178,7 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;

     geodir_delete_directory($dirname);

 }

 

@@ -1200,10 +1200,10 @@ 
         return false;

     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

+            if (!is_dir($dirname."/".$file))

+                unlink($dirname."/".$file);

             else

-                geodir_delete_directory($dirname . '/' . $file);

+                geodir_delete_directory($dirname.'/'.$file);

         }

     }

     closedir($dir_handle);

@@ -1232,8 +1232,8 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir.'/'.$filename))

+                    unlink($uploads_dir.'/'.$filename);

             }

 

         } // endif

@@ -1274,16 +1274,16 @@ 
         }

 

         if (!in_array($post_type, geodir_get_posttypes())) {

-            return false;// if not a GD CPT return;

+            return false; // if not a GD CPT return;

         }

 

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

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

 

         if (!$file) {

             if (isset($post->featured_image)) {

                 $file = $post->featured_image;

             } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));

             }

         }

 

@@ -1301,7 +1301,7 @@ 
 

             $file_name = $file_info['basename'];

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

+            $uploads_url = $uploads_baseurl.$sub_dir;

             /*

              * Allows the filter of image src for such things as CDN change.

              *

@@ -1311,8 +1311,8 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+            $img_arr['path'] = $uploads_path.'/'.$file_name;

             $width = 0;

             $height = 0;

             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1355,7 +1355,7 @@ 
                 $file_name = $file_info['basename'];

 

                 $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

 

                 $width = 0;

                 $height = 0;

@@ -1372,7 +1372,7 @@ 
         }

 

         if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );

         else

             return false;

     }

@@ -1435,7 +1435,7 @@ 
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ",

                 array('%image%', $post_id)

             )

         );

@@ -1461,7 +1461,7 @@ 
 

                 $file_name = $file_info['basename'];

 

-                $uploads_url = $uploads_baseurl . $sub_dir;

+                $uploads_url = $uploads_baseurl.$sub_dir;

                 /*

                 * Allows the filter of image src for such things as CDN change.

                 *

@@ -1471,8 +1471,8 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

                 $width = 0;

                 $height = 0;

                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1489,11 +1489,11 @@ 
                 $img_arr['content'] = $attechment->content; // add the description to the array

                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 $counter++;

             }

-            return (object)$return_arr;

+            return (object) $return_arr;

         } else if ($no_images) {

             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1532,7 +1532,7 @@ 
                 $img_arr['title'] = $file_info['filename']; // add the title to the array

                 $img_arr['content'] = $file_info['filename']; // add the description to the array

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 return $return_arr;

             } else

@@ -1559,8 +1559,8 @@ 
 

         $html = '';

         if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

+            if (!is_object($request)) {

+                $request = (object) $request;

             }

 

             if (isset($request->src) && !isset($request->path)) {

@@ -1574,7 +1574,7 @@ 
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

             if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);

             }

             

             $width = 0;

@@ -1589,7 +1589,7 @@ 
             $image->width = $width;

             $image->height = $height;

 

-            $max_size = (object)geodir_get_imagesize($size);

+            $max_size = (object) geodir_get_imagesize($size);

 

             if (!is_wp_error($max_size)) {

                 if ($image->width) {

@@ -1601,15 +1601,15 @@ 
                         $width_per = 100;

                 }

 

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {

+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';

                 } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {

+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');"></div>';

+                    } else {

                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

 

                     }

 

@@ -1645,15 +1645,15 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

 

-            if ($taxonomy == $post_type . '_tags') {

+            if ($taxonomy == $post_type.'_tags') {

                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

                     geodir_save_post_meta($post_id, 'post_tags', $terms);

                 }

-            } elseif ($taxonomy == $post_type . 'category') {

+            } elseif ($taxonomy == $post_type.'category') {

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

                 $replarr = array("&quot;", '');

 

@@ -1675,7 +1675,7 @@ 
 

                     $wpdb->get_var(

                         $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",

                             $cat_ids_array_del

                         )

                     );

@@ -1683,7 +1683,7 @@ 
 

                     $post_term = $wpdb->get_col(

                         $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",

                             $cat_ids_array

                         )

                     );

@@ -1705,16 +1705,16 @@ 
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);

 

                         $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

+                        $json .= '"id":"'.$post_id.'",';

+                        $json .= '"lat_pos": "'.$lat.'",';

+                        $json .= '"long_pos": "'.$lng.'",';

+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';

+                        $json .= '"icon":"'.$term_icon.'",';

+                        $json .= '"group":"catgroup'.$cat_id.'"';

                         $json .= '}';

 

 

@@ -1722,9 +1722,9 @@ 
                             $post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

@@ -1732,7 +1732,7 @@ 
 

                         } else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

@@ -1750,17 +1750,17 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';

 

                     if (empty($post_marker_json))

                         $post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "UPDATE " . $table . " SET

-								" . $taxonomy . " = %s,

+                                "UPDATE ".$table." SET

+								" . $taxonomy." = %s,

 								marker_json = %s

 								where post_id = %d",

                                 array($categories, $post_marker_json, $post_id)

@@ -1781,7 +1781,7 @@ 
 

                                     $wpdb->query(

                                         $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+                                            "UPDATE ".$table." SET

 											default_category = %s

 											where post_id = %d",

                                             array($categories[0], $post_id)

@@ -1806,9 +1806,9 @@ 
 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+                                "INSERT INTO ".$table." SET

 								post_id = %d,

-								" . $taxonomy . " = %s,

+								" . $taxonomy." = %s,

 								marker_json = %s ",

 

                                 array($post_id, $categories, $post_marker_json)

@@ -1931,7 +1931,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1939,7 +1939,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -1972,7 +1972,7 @@ 
                              * @param object $postinfo_obj The posts info as an object.

                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

                              */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);

                             ?>

                         </div>

                         <?php

@@ -1984,10 +1984,10 @@ 
                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>

+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>

 

                                 <span

-                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>

+                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>

                   <span class="geodir-bubble-reviews"><a href="<?php echo get_comments_link($ID); ?>"

                                                          class="geodir-pcomments"><i class="fa fa-comments"></i>

                           <?php echo get_comments_number($ID); ?>

@@ -2052,11 +2052,11 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",

                 array($status, $post_id)

             )

         );

@@ -2128,18 +2128,18 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2148,7 +2148,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2186,12 +2186,12 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

         /* Delete custom post meta*/

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

+                "DELETE FROM ".$table." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2200,7 +2200,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2210,7 +2210,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2282,7 +2282,7 @@ 
          */

         do_action('geodir_before_add_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+        echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>';

 

         /**

          * Called after adding the post from favourites.

@@ -2361,7 +2361,7 @@ 
          */

         do_action('geodir_before_remove_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+        echo '<a href="javascript:void(0);"  title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>';

 

         /**

          * Called after removing the post from favourites.

@@ -2456,24 +2456,24 @@ 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"

+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>

             </a>   </span><?php

 

         } else {

 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';

             } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

-                                                                                        onclick="<?php echo $script_text;?>"

-                                                                                        title="<?php echo $add_favourite_text;?>"><i

-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

+                                                                                        onclick="<?php echo $script_text; ?>"

+                                                                                        title="<?php echo $add_favourite_text; ?>"><i

+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>

         <?php }

     }

 }

@@ -2503,7 +2503,7 @@ 
 

             $post_type = $taxonomy_obj->object_type[0];

 

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

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

 

             /**

              * Filter to modify the 'join' query

@@ -2526,8 +2526,8 @@ 
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

             $count_query = "SELECT count(post_id) FROM

-							" . $table . " as pd " . $join . "

-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

+							" . $table." as pd ".$join."

+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;

 

             $cat_post_count = $wpdb->get_var($count_query);

             if (empty($cat_post_count) || is_wp_error($cat_post_count))

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

     $all_postypes = geodir_get_posttypes();

     if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+        return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>';

     }

 

     return $more;

@@ -2637,14 +2637,14 @@ 
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

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

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

 

         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';

 

         $posts = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",

                 array($term_id, $taxonomy)

             )

         );

@@ -2656,19 +2656,19 @@ 
                 $lng = $post_obj->post_longitude;

 

                 $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

+                $json .= '"id":"'.$post_obj->post_id.'",';

+                $json .= '"lat_pos": "'.$lat.'",';

+                $json .= '"long_pos": "'.$lng.'",';

+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';

+                $json .= '"icon":"'.$term_icon.'",';

+                $json .= '"group":"catgroup'.$term_id.'"';

                 $json .= '}';

 

                 if ($post_obj->default_category == $term_id) {

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",

                             array($json, $post_obj->post_id)

                         )

                     );

@@ -2676,7 +2676,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",

                         array($json, $post_obj->post_id, $term_id)

                     )

                 );

@@ -2800,7 +2800,7 @@ 
 //	print_r($uploads ) ;

     $post_first_image = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)

         )

     );

 

@@ -2821,9 +2821,9 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);

 

         $new_attachment_name = basename($post_first_image[0]->file);

 

@@ -2836,11 +2836,11 @@ 
                 wp_delete_attachment($post_thumbnail_id);

 

             }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+            $filename = $uploads['basedir'].$post_first_image[0]->file;

 

             $attachment = array(

                 'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,

                 'post_parent' => $post_id,

                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

                 'post_content' => ''

@@ -2853,7 +2853,7 @@ 
 

                 set_post_thumbnail($post_id, $id);

 

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

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

                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

             }

@@ -2886,35 +2886,35 @@ 
         $post_id = absint($_POST['post_id']);

         $upload_dir = wp_upload_dir();

         $post_type = get_post_type($_POST['post_id']);

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

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

 

         $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

             array($post_id)

         )

             , ARRAY_A);

 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

                 array('%image%', $post_id)

             )

         );

         if ($arrImages) {

             $image_arr = array();

             foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

+                $image_arr[] = $upload_dir['baseurl'].$img->file;

             }

             $comma_separated = implode(",", $image_arr);

             $post_arr[0]['post_images'] = $comma_separated;

         }

 

 

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];

         $cat_arr = array_filter(explode(",", $cats));

         $trans_cat = array();

         foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'].'category', false);

         }

 

 

@@ -2956,7 +2956,7 @@ 
 

     $get_data = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",

             array($listing_type)

         )

     );

@@ -2969,12 +2969,12 @@ 
 

                 $extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+                $prefix = $data->htmlvar_name.'_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+                $fields_info[$prefix.'address'] = $data->field_type;

 

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

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                    $fields_info[$prefix.'zip'] = $data->field_type;

 

             } else {

 

@@ -3072,13 +3072,13 @@ 
  * @since 1.4.9

  * @package GeoDirectory

  */

-function geodir_fb_like_thumbnail(){

+function geodir_fb_like_thumbnail() {

 

     // return if not a single post

-    if(!is_single()){return;}

+    if (!is_single()) {return; }

 

     global $post;

-    if(isset($post->featured_image) && $post->featured_image){

+    if (isset($post->featured_image) && $post->featured_image) {

         $upload_dir = wp_upload_dir();

         $thumb = $upload_dir['baseurl'].$post->featured_image;

         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";