GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/auth/Google_LoginTicket.php

Indentation +7 added lines, -7 removed lines

@@ -36,8 +36,8 @@ 
    * @param string $payload Information from a verified authentication token.
    */
   public function __construct($envelope, $payload) {
-    $this->envelope = $envelope;
-    $this->payload = $payload;
+	$this->envelope = $envelope;
+	$this->payload = $payload;
   }
 
   /**
@@ -46,10 +46,10 @@ 
    * @return
    */
   public function getUserId() {
-    if (array_key_exists(self::USER_ATTR, $this->payload)) {
-      return $this->payload[self::USER_ATTR];
-    }
-    throw new Google_AuthException("No user_id in token");
+	if (array_key_exists(self::USER_ATTR, $this->payload)) {
+	  return $this->payload[self::USER_ATTR];
+	}
+	throw new Google_AuthException("No user_id in token");
   }
 
   /**
@@ -58,6 +58,6 @@ 
    * @return array
    */
   public function getAttributes() {
-    return array("envelope" => $this->envelope, "payload" => $this->payload);
+	return array("envelope" => $this->envelope, "payload" => $this->payload);
   }
 }

geodirectory-admin/google-api-php-client/src/auth/Google_AssertionCredentials.php

Indentation +37 added lines, -37 removed lines

@@ -45,39 +45,39 @@ 
    *               application is requesting delegated access.
    */
   public function __construct(
-      $serviceAccountName,
-      $scopes,
-      $privateKey,
-      $privateKeyPassword = 'notasecret',
-      $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
-      $sub = false) {
-    $this->serviceAccountName = $serviceAccountName;
-    $this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
-    $this->privateKey = $privateKey;
-    $this->privateKeyPassword = $privateKeyPassword;
-    $this->assertionType = $assertionType;
-    $this->sub = $sub;
-    $this->prn = $sub;
+	  $serviceAccountName,
+	  $scopes,
+	  $privateKey,
+	  $privateKeyPassword = 'notasecret',
+	  $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
+	  $sub = false) {
+	$this->serviceAccountName = $serviceAccountName;
+	$this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
+	$this->privateKey = $privateKey;
+	$this->privateKeyPassword = $privateKeyPassword;
+	$this->assertionType = $assertionType;
+	$this->sub = $sub;
+	$this->prn = $sub;
   }
 
   public function generateAssertion() {
-    $now = time();
+	$now = time();
 
-    $jwtParams = array(
-          'aud' => Google_OAuth2::OAUTH2_TOKEN_URI,
-          'scope' => $this->scopes,
-          'iat' => $now,
-          'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
-          'iss' => $this->serviceAccountName,
-    );
+	$jwtParams = array(
+		  'aud' => Google_OAuth2::OAUTH2_TOKEN_URI,
+		  'scope' => $this->scopes,
+		  'iat' => $now,
+		  'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
+		  'iss' => $this->serviceAccountName,
+	);
 
-    if ($this->sub !== false) {
-      $jwtParams['sub'] = $this->sub;
-    } else if ($this->prn !== false) {
-      $jwtParams['prn'] = $this->prn;
-    }
+	if ($this->sub !== false) {
+	  $jwtParams['sub'] = $this->sub;
+	} else if ($this->prn !== false) {
+	  $jwtParams['prn'] = $this->prn;
+	}
 
-    return $this->makeSignedJwt($jwtParams);
+	return $this->makeSignedJwt($jwtParams);
   }
 
   /**
@@ -86,18 +86,18 @@ 
    * @return string The signed JWT.
    */
   private function makeSignedJwt($payload) {
-    $header = array('typ' => 'JWT', 'alg' => 'RS256');
+	$header = array('typ' => 'JWT', 'alg' => 'RS256');
 
-    $segments = array(
-      Google_Utils::urlSafeB64Encode(json_encode($header)),
-      Google_Utils::urlSafeB64Encode(json_encode($payload))
-    );
+	$segments = array(
+	  Google_Utils::urlSafeB64Encode(json_encode($header)),
+	  Google_Utils::urlSafeB64Encode(json_encode($payload))
+	);
 
-    $signingInput = implode('.', $segments);
-    $signer = new Google_P12Signer($this->privateKey, $this->privateKeyPassword);
-    $signature = $signer->sign($signingInput);
-    $segments[] = Google_Utils::urlSafeB64Encode($signature);
+	$signingInput = implode('.', $segments);
+	$signer = new Google_P12Signer($this->privateKey, $this->privateKeyPassword);
+	$signature = $signer->sign($signingInput);
+	$segments[] = Google_Utils::urlSafeB64Encode($signature);
 
-    return implode(".", $segments);
+	return implode(".", $segments);
   }
 }

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

Indentation +61 added lines, -61 removed lines

@@ -57,13 +57,13 @@ 
    * Otherwise, return false.
    */
   protected function setCachedRequest(Google_HttpRequest $request) {
-    // Determine if the request is cacheable.
-    if (Google_CacheParser::isResponseCacheable($request)) {
-      Google_Client::$cache->set($request->getCacheKey(), $request);
-      return true;
-    }
+	// Determine if the request is cacheable.
+	if (Google_CacheParser::isResponseCacheable($request)) {
+	  Google_Client::$cache->set($request->getCacheKey(), $request);
+	  return true;
+	}
 
-    return false;
+	return false;
   }
 
   /**
@@ -73,11 +73,11 @@ 
    * false if the operation was unsuccessful.
    */
   protected function getCachedRequest(Google_HttpRequest $request) {
-    if (false == Google_CacheParser::isRequestCacheable($request)) {
-      false;
-    }
+	if (false == Google_CacheParser::isRequestCacheable($request)) {
+	  false;
+	}
 
-    return Google_Client::$cache->get($request->getCacheKey());
+	return Google_Client::$cache->get($request->getCacheKey());
   }
 
   /**
@@ -87,28 +87,28 @@ 
    * @return Google_HttpRequest Processed request with the enclosed entity.
    */
   protected function processEntityRequest(Google_HttpRequest $request) {
-    $postBody = $request->getPostBody();
-    $contentType = $request->getRequestHeader("content-type");
-
-    // Set the default content-type as application/x-www-form-urlencoded.
-    if (false == $contentType) {
-      $contentType = self::FORM_URLENCODED;
-      $request->setRequestHeaders(array('content-type' => $contentType));
-    }
-
-    // Force the payload to match the content-type asserted in the header.
-    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
-      $postBody = http_build_query($postBody, '', '&');
-      $request->setPostBody($postBody);
-    }
-
-    // Make sure the content-length header is set.
-    if (!$postBody || is_string($postBody)) {
-      $postsLength = strlen($postBody);
-      $request->setRequestHeaders(array('content-length' => $postsLength));
-    }
-
-    return $request;
+	$postBody = $request->getPostBody();
+	$contentType = $request->getRequestHeader("content-type");
+
+	// Set the default content-type as application/x-www-form-urlencoded.
+	if (false == $contentType) {
+	  $contentType = self::FORM_URLENCODED;
+	  $request->setRequestHeaders(array('content-type' => $contentType));
+	}
+
+	// Force the payload to match the content-type asserted in the header.
+	if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
+	  $postBody = http_build_query($postBody, '', '&');
+	  $request->setPostBody($postBody);
+	}
+
+	// Make sure the content-length header is set.
+	if (!$postBody || is_string($postBody)) {
+	  $postsLength = strlen($postBody);
+	  $request->setRequestHeaders(array('content-length' => $postsLength));
+	}
+
+	return $request;
   }
 
   /**
@@ -120,21 +120,21 @@ 
    * still current and can be re-used.
    */
   protected function checkMustRevaliadateCachedRequest($cached, $request) {
-    if (Google_CacheParser::mustRevalidate($cached)) {
-      $addHeaders = array();
-      if ($cached->getResponseHeader('etag')) {
-        // [13.3.4] If an entity tag has been provided by the origin server,
-        // we must use that entity tag in any cache-conditional request.
-        $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
-      } elseif ($cached->getResponseHeader('date')) {
-        $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
-      }
-
-      $request->setRequestHeaders($addHeaders);
-      return true;
-    } else {
-      return false;
-    }
+	if (Google_CacheParser::mustRevalidate($cached)) {
+	  $addHeaders = array();
+	  if ($cached->getResponseHeader('etag')) {
+		// [13.3.4] If an entity tag has been provided by the origin server,
+		// we must use that entity tag in any cache-conditional request.
+		$addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
+	  } elseif ($cached->getResponseHeader('date')) {
+		$addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
+	  }
+
+	  $request->setRequestHeaders($addHeaders);
+	  return true;
+	} else {
+	  return false;
+	}
   }
 
   /**
@@ -143,19 +143,19 @@ 
    * @param mixed Associative array of response headers from the last request.
    */
   protected function updateCachedRequest($cached, $responseHeaders) {
-    if (isset($responseHeaders['connection'])) {
-      $hopByHop = array_merge(
-        self::$HOP_BY_HOP,
-        explode(',', $responseHeaders['connection'])
-      );
-
-      $endToEnd = array();
-      foreach($hopByHop as $key) {
-        if (isset($responseHeaders[$key])) {
-          $endToEnd[$key] = $responseHeaders[$key];
-        }
-      }
-      $cached->setResponseHeaders($endToEnd);
-    }
+	if (isset($responseHeaders['connection'])) {
+	  $hopByHop = array_merge(
+		self::$HOP_BY_HOP,
+		explode(',', $responseHeaders['connection'])
+	  );
+
+	  $endToEnd = array();
+	  foreach($hopByHop as $key) {
+		if (isset($responseHeaders[$key])) {
+		  $endToEnd[$key] = $responseHeaders[$key];
+		}
+	  }
+	  $cached->setResponseHeaders($endToEnd);
+	}
   }
 }

Spacing +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
  * limitations under the License.
  */
 
-require_once GA_API_Path. 'io/Google_HttpRequest.php';
-require_once GA_API_Path. 'io/Google_HttpStreamIO.php';
-require_once GA_API_Path. 'io/Google_CurlIO.php';
-require_once GA_API_Path. 'io/Google_REST.php';
+require_once GA_API_Path.'io/Google_HttpRequest.php';
+require_once GA_API_Path.'io/Google_HttpStreamIO.php';
+require_once GA_API_Path.'io/Google_CurlIO.php';
+require_once GA_API_Path.'io/Google_REST.php';
 
 /**
  * Abstract IO class
@@ -150,7 +150,7 @@ 
       );
 
       $endToEnd = array();
-      foreach($hopByHop as $key) {
+      foreach ($hopByHop as $key) {
         if (isset($responseHeaders[$key])) {
           $endToEnd[$key] = $responseHeaders[$key];
         }

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

Indentation +62 added lines, -62 removed lines

@@ -32,11 +32,11 @@ 
    *  invalid or malformed post body, invalid url)
    */
   static public function execute(Google_HttpRequest $req) {
-    $httpRequest = Google_Client::$io->makeRequest($req);
-    $decodedResponse = self::decodeHttpResponse($httpRequest);
-    $ret = isset($decodedResponse['data'])
-        ? $decodedResponse['data'] : $decodedResponse;
-    return $ret;
+	$httpRequest = Google_Client::$io->makeRequest($req);
+	$decodedResponse = self::decodeHttpResponse($httpRequest);
+	$ret = isset($decodedResponse['data'])
+		? $decodedResponse['data'] : $decodedResponse;
+	return $ret;
   }
 
   
@@ -48,32 +48,32 @@ 
    * @return mixed|null
    */
   public static function decodeHttpResponse($response) {
-    $code = $response->getResponseHttpCode();
-    $body = $response->getResponseBody();
-    $decoded = null;
+	$code = $response->getResponseHttpCode();
+	$body = $response->getResponseBody();
+	$decoded = null;
     
-    if ((intVal($code)) >= 300) {
-      $decoded = json_decode($body, true);
-      $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
-      if ($decoded != null && isset($decoded['error']['message'])  && isset($decoded['error']['code'])) {
-        // if we're getting a json encoded error definition, use that instead of the raw response
-        // body for improved readability
-        $err .= ": ({$decoded['error']['code']}) {$decoded['error']['message']}";
-      } else {
-        $err .= ": ($code) $body";
-      }
+	if ((intVal($code)) >= 300) {
+	  $decoded = json_decode($body, true);
+	  $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
+	  if ($decoded != null && isset($decoded['error']['message'])  && isset($decoded['error']['code'])) {
+		// if we're getting a json encoded error definition, use that instead of the raw response
+		// body for improved readability
+		$err .= ": ({$decoded['error']['code']}) {$decoded['error']['message']}";
+	  } else {
+		$err .= ": ($code) $body";
+	  }
 
-      throw new Google_ServiceException($err, $code, null, $decoded['error']['errors']);
-    }
+	  throw new Google_ServiceException($err, $code, null, $decoded['error']['errors']);
+	}
     
-    // Only attempt to decode the response, if the response code wasn't (204) 'no content'
-    if ($code != '204') {
-      $decoded = json_decode($body, true);
-      if ($decoded === null || $decoded === "") {
-        throw new Google_ServiceException("Invalid json in service response: $body");
-      }
-    }
-    return $decoded;
+	// Only attempt to decode the response, if the response code wasn't (204) 'no content'
+	if ($code != '204') {
+	  $decoded = json_decode($body, true);
+	  if ($decoded === null || $decoded === "") {
+		throw new Google_ServiceException("Invalid json in service response: $body");
+	  }
+	}
+	return $decoded;
   }
 
   /**
@@ -86,43 +86,43 @@ 
    * @return string $requestUrl
    */
   static function createRequestUri($servicePath, $restPath, $params) {
-    $requestUrl = $servicePath . $restPath;
-    $uriTemplateVars = array();
-    $queryVars = array();
-    foreach ($params as $paramName => $paramSpec) {
-      // Discovery v1.0 puts the canonical location under the 'location' field.
-      if (! isset($paramSpec['location'])) {
-        $paramSpec['location'] = $paramSpec['restParameterType'];
-      }
+	$requestUrl = $servicePath . $restPath;
+	$uriTemplateVars = array();
+	$queryVars = array();
+	foreach ($params as $paramName => $paramSpec) {
+	  // Discovery v1.0 puts the canonical location under the 'location' field.
+	  if (! isset($paramSpec['location'])) {
+		$paramSpec['location'] = $paramSpec['restParameterType'];
+	  }
 
-      if ($paramSpec['type'] == 'boolean') {
-        $paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
-      }
-      if ($paramSpec['location'] == 'path') {
-        $uriTemplateVars[$paramName] = $paramSpec['value'];
-      } else {
-        if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
-          foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode($value);
-          }
-        } else {
-          $queryVars[] = $paramName . '=' . rawurlencode($paramSpec['value']);
-        }
-      }
-    }
+	  if ($paramSpec['type'] == 'boolean') {
+		$paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
+	  }
+	  if ($paramSpec['location'] == 'path') {
+		$uriTemplateVars[$paramName] = $paramSpec['value'];
+	  } else {
+		if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
+		  foreach ($paramSpec['value'] as $value) {
+			$queryVars[] = $paramName . '=' . rawurlencode($value);
+		  }
+		} else {
+		  $queryVars[] = $paramName . '=' . rawurlencode($paramSpec['value']);
+		}
+	  }
+	}
 
-    if (count($uriTemplateVars)) {
-      $uriTemplateParser = new URI_Template_Parser($requestUrl);
-      $requestUrl = $uriTemplateParser->expand($uriTemplateVars);
-    }
-    //FIXME work around for the the uri template lib which url encodes
-    // the @'s & confuses our servers.
-    $requestUrl = str_replace('%40', '@', $requestUrl);
+	if (count($uriTemplateVars)) {
+	  $uriTemplateParser = new URI_Template_Parser($requestUrl);
+	  $requestUrl = $uriTemplateParser->expand($uriTemplateVars);
+	}
+	//FIXME work around for the the uri template lib which url encodes
+	// the @'s & confuses our servers.
+	$requestUrl = str_replace('%40', '@', $requestUrl);
 
-    if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
-    }
+	if (count($queryVars)) {
+	  $requestUrl .= '?' . implode($queryVars, '&');
+	}
 
-    return $requestUrl;
+	return $requestUrl;
   }
 }

Spacing +7 added lines, -7 removed lines

@@ -54,8 +54,8 @@ 
     
     if ((intVal($code)) >= 300) {
       $decoded = json_decode($body, true);
-      $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
-      if ($decoded != null && isset($decoded['error']['message'])  && isset($decoded['error']['code'])) {
+      $err = 'Error calling '.$response->getRequestMethod().' '.$response->getUrl();
+      if ($decoded != null && isset($decoded['error']['message']) && isset($decoded['error']['code'])) {
         // if we're getting a json encoded error definition, use that instead of the raw response
         // body for improved readability
         $err .= ": ({$decoded['error']['code']}) {$decoded['error']['message']}";
@@ -86,12 +86,12 @@ 
    * @return string $requestUrl
    */
   static function createRequestUri($servicePath, $restPath, $params) {
-    $requestUrl = $servicePath . $restPath;
+    $requestUrl = $servicePath.$restPath;
     $uriTemplateVars = array();
     $queryVars = array();
     foreach ($params as $paramName => $paramSpec) {
       // Discovery v1.0 puts the canonical location under the 'location' field.
-      if (! isset($paramSpec['location'])) {
+      if (!isset($paramSpec['location'])) {
         $paramSpec['location'] = $paramSpec['restParameterType'];
       }
 
@@ -103,10 +103,10 @@ 
       } else {
         if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
           foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode($value);
+            $queryVars[] = $paramName.'='.rawurlencode($value);
           }
         } else {
-          $queryVars[] = $paramName . '=' . rawurlencode($paramSpec['value']);
+          $queryVars[] = $paramName.'='.rawurlencode($paramSpec['value']);
         }
       }
     }
@@ -120,7 +120,7 @@ 
     $requestUrl = str_replace('%40', '@', $requestUrl);
 
     if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
+      $requestUrl .= '?'.implode($queryVars, '&');
     }
 
     return $requestUrl;

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

Indentation +114 added lines, -114 removed lines

@@ -27,26 +27,26 @@ 
 class Google_CurlIO extends Google_IO {
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
   private static $HOP_BY_HOP = array(
-      'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
-      'te', 'trailers', 'transfer-encoding', 'upgrade');
+	  'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
+	  'te', 'trailers', 'transfer-encoding', 'upgrade');
 
   private $curlParams = array (
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_FOLLOWLOCATION => 0,
-      CURLOPT_FAILONERROR => false,
-      CURLOPT_SSL_VERIFYPEER => true,
-      CURLOPT_HEADER => true,
-      CURLOPT_VERBOSE => false,
+	  CURLOPT_RETURNTRANSFER => true,
+	  CURLOPT_FOLLOWLOCATION => 0,
+	  CURLOPT_FAILONERROR => false,
+	  CURLOPT_SSL_VERIFYPEER => true,
+	  CURLOPT_HEADER => true,
+	  CURLOPT_VERBOSE => false,
   );
 
   /**
    * Check for cURL availability.
    */
   public function __construct() {
-    if (! function_exists('curl_init')) {
-      throw new Exception(
-        'Google CurlIO client requires the CURL PHP extension');
-    }
+	if (! function_exists('curl_init')) {
+	  throw new Exception(
+		'Google CurlIO client requires the CURL PHP extension');
+	}
   }
 
   /**
@@ -60,8 +60,8 @@ 
    * responseHttpCode, responseHeaders and responseBody.
    */
   public function authenticatedRequest(Google_HttpRequest $request) {
-    $request = Google_Client::$auth->sign($request);
-    return $this->makeRequest($request);
+	$request = Google_Client::$auth->sign($request);
+	return $this->makeRequest($request);
   }
 
   /**
@@ -73,75 +73,75 @@ 
    * @throws Google_IOException on curl or IO error
    */
   public function makeRequest(Google_HttpRequest $request) {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false) {
-      if (!$this->checkMustRevaliadateCachedRequest($cached, $request)) {
-        return $cached;
-      }
-    }
-
-    if (array_key_exists($request->getRequestMethod(),
-          self::$ENTITY_HTTP_METHODS)) {
-      $request = $this->processEntityRequest($request);
-    }
-
-    $ch = curl_init();
-    curl_setopt_array($ch, $this->curlParams);
-    curl_setopt($ch, CURLOPT_URL, $request->getUrl());
-    if ($request->getPostBody()) {
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $request->getPostBody());
-    }
-
-    $requestHeaders = $request->getRequestHeaders();
-    if ($requestHeaders && is_array($requestHeaders)) {
-      $parsed = array();
-      foreach ($requestHeaders as $k => $v) {
-        $parsed[] = "$k: $v";
-      }
-      curl_setopt($ch, CURLOPT_HTTPHEADER, $parsed);
-    }
-
-    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
-    curl_setopt($ch, CURLOPT_USERAGENT, $request->getUserAgent());
-    $respData = curl_exec($ch);
-
-    // Retry if certificates are missing.
-    if (curl_errno($ch) == CURLE_SSL_CACERT) {
-      error_log('SSL certificate problem, verify that the CA cert is OK.'
-        . ' Retrying with the CA cert bundle from google-api-php-client.');
-      curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
-      $respData = curl_exec($ch);
-    }
-
-    $respHeaderSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-    $respHttpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-    $curlErrorNum = curl_errno($ch);
-    $curlError = curl_error($ch);
-    curl_close($ch);
-    if ($curlErrorNum != CURLE_OK) {
-      throw new Google_IOException("HTTP Error: ($respHttpCode) $curlError");
-    }
-
-    // Parse out the raw response into usable bits
-    list($responseHeaders, $responseBody) =
-          self::parseHttpResponse($respData, $respHeaderSize);
-
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      $this->updateCachedRequest($cached, $responseHeaders);
-      return $cached;
-    }
-
-    // Fill in the apiHttpRequest with the response values
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($responseBody);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    // And finally return it
-    return $request;
+	// First, check to see if we have a valid cached version.
+	$cached = $this->getCachedRequest($request);
+	if ($cached !== false) {
+	  if (!$this->checkMustRevaliadateCachedRequest($cached, $request)) {
+		return $cached;
+	  }
+	}
+
+	if (array_key_exists($request->getRequestMethod(),
+		  self::$ENTITY_HTTP_METHODS)) {
+	  $request = $this->processEntityRequest($request);
+	}
+
+	$ch = curl_init();
+	curl_setopt_array($ch, $this->curlParams);
+	curl_setopt($ch, CURLOPT_URL, $request->getUrl());
+	if ($request->getPostBody()) {
+	  curl_setopt($ch, CURLOPT_POSTFIELDS, $request->getPostBody());
+	}
+
+	$requestHeaders = $request->getRequestHeaders();
+	if ($requestHeaders && is_array($requestHeaders)) {
+	  $parsed = array();
+	  foreach ($requestHeaders as $k => $v) {
+		$parsed[] = "$k: $v";
+	  }
+	  curl_setopt($ch, CURLOPT_HTTPHEADER, $parsed);
+	}
+
+	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
+	curl_setopt($ch, CURLOPT_USERAGENT, $request->getUserAgent());
+	$respData = curl_exec($ch);
+
+	// Retry if certificates are missing.
+	if (curl_errno($ch) == CURLE_SSL_CACERT) {
+	  error_log('SSL certificate problem, verify that the CA cert is OK.'
+		. ' Retrying with the CA cert bundle from google-api-php-client.');
+	  curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+	  $respData = curl_exec($ch);
+	}
+
+	$respHeaderSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+	$respHttpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	$curlErrorNum = curl_errno($ch);
+	$curlError = curl_error($ch);
+	curl_close($ch);
+	if ($curlErrorNum != CURLE_OK) {
+	  throw new Google_IOException("HTTP Error: ($respHttpCode) $curlError");
+	}
+
+	// Parse out the raw response into usable bits
+	list($responseHeaders, $responseBody) =
+		  self::parseHttpResponse($respData, $respHeaderSize);
+
+	if ($respHttpCode == 304 && $cached) {
+	  // If the server responded NOT_MODIFIED, return the cached request.
+	  $this->updateCachedRequest($cached, $responseHeaders);
+	  return $cached;
+	}
+
+	// Fill in the apiHttpRequest with the response values
+	$request->setResponseHttpCode($respHttpCode);
+	$request->setResponseHeaders($responseHeaders);
+	$request->setResponseBody($responseBody);
+	// Store the request in cache (the function checks to see if the request
+	// can actually be cached)
+	$this->setCachedRequest($request);
+	// And finally return it
+	return $request;
   }
 
   /**
@@ -152,9 +152,9 @@ 
    * @param array $optCurlParams Multiple options used by a cURL session.
    */
   public function setOptions($optCurlParams) {
-    foreach ($optCurlParams as $key => $val) {
-      $this->curlParams[$key] = $val;
-    }
+	foreach ($optCurlParams as $key => $val) {
+	  $this->curlParams[$key] = $val;
+	}
   }
 
   /**
@@ -163,36 +163,36 @@ 
    * @return array
    */
   private static function parseHttpResponse($respData, $headerSize) {
-    if (stripos($respData, parent::CONNECTION_ESTABLISHED) !== false) {
-      $respData = str_ireplace(parent::CONNECTION_ESTABLISHED, '', $respData);
-    }
-
-    if ($headerSize) {
-      $responseBody = substr($respData, $headerSize);
-      $responseHeaders = substr($respData, 0, $headerSize);
-    } else {
-      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
-    }
-
-    $responseHeaders = self::parseResponseHeaders($responseHeaders);
-    return array($responseHeaders, $responseBody);
+	if (stripos($respData, parent::CONNECTION_ESTABLISHED) !== false) {
+	  $respData = str_ireplace(parent::CONNECTION_ESTABLISHED, '', $respData);
+	}
+
+	if ($headerSize) {
+	  $responseBody = substr($respData, $headerSize);
+	  $responseHeaders = substr($respData, 0, $headerSize);
+	} else {
+	  list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+	}
+
+	$responseHeaders = self::parseResponseHeaders($responseHeaders);
+	return array($responseHeaders, $responseBody);
   }
 
   private static function parseResponseHeaders($rawHeaders) {
-    $responseHeaders = array();
-
-    $responseHeaderLines = explode("\r\n", $rawHeaders);
-    foreach ($responseHeaderLines as $headerLine) {
-      if ($headerLine && strpos($headerLine, ':') !== false) {
-        list($header, $value) = explode(': ', $headerLine, 2);
-        $header = strtolower($header);
-        if (isset($responseHeaders[$header])) {
-          $responseHeaders[$header] .= "\n" . $value;
-        } else {
-          $responseHeaders[$header] = $value;
-        }
-      }
-    }
-    return $responseHeaders;
+	$responseHeaders = array();
+
+	$responseHeaderLines = explode("\r\n", $rawHeaders);
+	foreach ($responseHeaderLines as $headerLine) {
+	  if ($headerLine && strpos($headerLine, ':') !== false) {
+		list($header, $value) = explode(': ', $headerLine, 2);
+		$header = strtolower($header);
+		if (isset($responseHeaders[$header])) {
+		  $responseHeaders[$header] .= "\n" . $value;
+		} else {
+		  $responseHeaders[$header] = $value;
+		}
+	  }
+	}
+	return $responseHeaders;
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
       'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
       'te', 'trailers', 'transfer-encoding', 'upgrade');
 
-  private $curlParams = array (
+  private $curlParams = array(
       CURLOPT_RETURNTRANSFER => true,
       CURLOPT_FOLLOWLOCATION => 0,
       CURLOPT_FAILONERROR => false,
@@ -43,7 +43,7 @@ 
    * Check for cURL availability.
    */
   public function __construct() {
-    if (! function_exists('curl_init')) {
+    if (!function_exists('curl_init')) {
       throw new Exception(
         'Google CurlIO client requires the CURL PHP extension');
     }
@@ -110,7 +110,7 @@ 
     if (curl_errno($ch) == CURLE_SSL_CACERT) {
       error_log('SSL certificate problem, verify that the CA cert is OK.'
         . ' Retrying with the CA cert bundle from google-api-php-client.');
-      curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+      curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__).'/cacerts.pem');
       $respData = curl_exec($ch);
     }
 
@@ -187,7 +187,7 @@ 
         list($header, $value) = explode(': ', $headerLine, 2);
         $header = strtolower($header);
         if (isset($responseHeaders[$header])) {
-          $responseHeaders[$header] .= "\n" . $value;
+          $responseHeaders[$header] .= "\n".$value;
         } else {
           $responseHeaders[$header] = $value;
         }

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/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';
 

Braces +13 added lines, -10 removed lines

@@ -17,10 +17,11 @@ 
     update_option($post_type.'_dummy_data_type','standard_places');
 }
 
-if (geodir_dummy_folder_exists())
+if (geodir_dummy_folder_exists()) {
     $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
-else
+} else {
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+}
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
@@ -1815,16 +1816,18 @@ 
 echo '###4.1';
 foreach ($post_info as $post_info) {echo '###5';
     $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_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');
     

geodirectory-functions/ajax_handler_functions.php

Indentation +306 added lines, -306 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,290 +104,290 @@ 
  * @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;

-

-                    $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

-                    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']),$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;

+

+					$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

+					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']),$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();

@@ -151,7 +151,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']),$datatype);

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

                     break;

                 case "geodir_dummy_insert" :

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

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

                          *

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

                     }

 

 

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

         }

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

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

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

@@ -375,7 +375,7 @@ 
 }

 

 

-function geodir_show_ga_stats(){

+function geodir_show_ga_stats() {

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

         $ga_start = $_REQUEST['ga_start'];

     } else {

@@ -389,5 +389,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

Braces +27 added lines, -20 removed lines

@@ -112,10 +112,11 @@ 
     }

 

     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['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'])) {

@@ -137,12 +138,13 @@ 
         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 (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 

                     $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

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

-                        /**

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

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

                          *

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

@@ -151,11 +153,13 @@ 
                          * @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']),$datatype);

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

                 case "geodir_dummy_insert" :

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

-                        return;

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

@@ -254,8 +258,9 @@ 
                         } 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());

+                        } else {
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
+                        }
 

                         wp_redirect($redirect_to);

                     } else {

@@ -268,9 +273,9 @@ 
 

                     $gd_session->un_set('listing');

 

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

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

-                    else {

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

                     }

@@ -298,8 +303,9 @@ 
                             } 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());

+                            } else {
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
+                            }
 

                             $gd_session->un_set('listing');

                             wp_redirect($redirect_to);

@@ -320,8 +326,9 @@ 
                             $lastid = wp_delete_post($_REQUEST['pid']);

                         }

 

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

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

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

                     }