GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/Google/Http/Batch.php

Indentation +82 added lines, -82 removed lines

@@ -41,105 +41,105 @@
 
   public function __construct(Google_Client $client, $boundary = false, $rootUrl = '', $batchPath = '')
   {
-    $this->client = $client;
-    $this->root_url = rtrim($rootUrl ? $rootUrl : $this->client->getBasePath(), '/');
-    $this->batch_path = $batchPath ? $batchPath : 'batch';
-    $this->expected_classes = array();
-    $boundary = (false == $boundary) ? mt_rand() : $boundary;
-    $this->boundary = str_replace('"', '', $boundary);
+	$this->client = $client;
+	$this->root_url = rtrim($rootUrl ? $rootUrl : $this->client->getBasePath(), '/');
+	$this->batch_path = $batchPath ? $batchPath : 'batch';
+	$this->expected_classes = array();
+	$boundary = (false == $boundary) ? mt_rand() : $boundary;
+	$this->boundary = str_replace('"', '', $boundary);
   }
 
   public function add(Google_Http_Request $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_Http_Request $req */
-    foreach ($this->requests as $key => $req) {
-      $body .= "--{$this->boundary}\n";
-      $body .= $req->toBatchString($key) . "\n\n";
-      $this->expected_classes["response-" . $key] = $req->getExpectedClass();
-    }
+	/** @var Google_Http_Request $req */
+	foreach ($this->requests as $key => $req) {
+	  $body .= "--{$this->boundary}\n";
+	  $body .= $req->toBatchString($key) . "\n\n";
+	  $this->expected_classes["response-" . $key] = $req->getExpectedClass();
+	}
 
-    $body .= "--{$this->boundary}--";
+	$body .= "--{$this->boundary}--";
 
-    $url = $this->root_url . '/' . $this->batch_path;
-    $httpRequest = new Google_Http_Request($url, 'POST');
-    $httpRequest->setRequestHeaders(
-        array('Content-Type' => 'multipart/mixed; boundary=' . $this->boundary)
-    );
+	$url = $this->root_url . '/' . $this->batch_path;
+	$httpRequest = new Google_Http_Request($url, 'POST');
+	$httpRequest->setRequestHeaders(
+		array('Content-Type' => 'multipart/mixed; boundary=' . $this->boundary)
+	);
 
-    $httpRequest->setPostBody($body);
-    $response = $this->client->getIo()->makeRequest($httpRequest);
+	$httpRequest->setPostBody($body);
+	$response = $this->client->getIo()->makeRequest($httpRequest);
 
-    return $this->parseResponse($response);
+	return $this->parseResponse($response);
   }
 
   public function parseResponse(Google_Http_Request $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 = $this->client->getIo()->getHttpResponseHeaders($metaHeaders);
-
-          $status = substr($part, 0, strpos($part, "\n"));
-          $status = explode(" ", $status);
-          $status = $status[1];
-
-          list($partHeaders, $partBody) = $this->client->getIo()->ParseHttpResponse($part, false);
-          $response = new Google_Http_Request("");
-          $response->setResponseHttpCode($status);
-          $response->setResponseHeaders($partHeaders);
-          $response->setResponseBody($partBody);
-
-          // Need content id.
-          $key = $metaHeaders['content-id'];
-
-          if (isset($this->expected_classes[$key]) &&
-              strlen($this->expected_classes[$key]) > 0) {
-            $class = $this->expected_classes[$key];
-            $response->setExpectedClass($class);
-          }
-
-          try {
-            $response = Google_Http_REST::decodeHttpResponse($response, $this->client);
-            $responses[$key] = $response;
-          } catch (Google_Service_Exception $e) {
-            // Store the exception as the response, so successful responses
-            // can be processed.
-            $responses[$key] = $e;
-          }
-        }
-      }
-
-      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 = $this->client->getIo()->getHttpResponseHeaders($metaHeaders);
+
+		  $status = substr($part, 0, strpos($part, "\n"));
+		  $status = explode(" ", $status);
+		  $status = $status[1];
+
+		  list($partHeaders, $partBody) = $this->client->getIo()->ParseHttpResponse($part, false);
+		  $response = new Google_Http_Request("");
+		  $response->setResponseHttpCode($status);
+		  $response->setResponseHeaders($partHeaders);
+		  $response->setResponseBody($partBody);
+
+		  // Need content id.
+		  $key = $metaHeaders['content-id'];
+
+		  if (isset($this->expected_classes[$key]) &&
+			  strlen($this->expected_classes[$key]) > 0) {
+			$class = $this->expected_classes[$key];
+			$response->setExpectedClass($class);
+		  }
+
+		  try {
+			$response = Google_Http_REST::decodeHttpResponse($response, $this->client);
+			$responses[$key] = $response;
+		  } catch (Google_Service_Exception $e) {
+			// Store the exception as the response, so successful responses
+			// can be processed.
+			$responses[$key] = $e;
+		  }
+		}
+	  }
+
+	  return $responses;
+	}
+
+	return null;
   }
 }

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -65,16 +65,16 @@ 
     /** @var Google_Http_Request $req */
     foreach ($this->requests as $key => $req) {
       $body .= "--{$this->boundary}\n";
-      $body .= $req->toBatchString($key) . "\n\n";
-      $this->expected_classes["response-" . $key] = $req->getExpectedClass();
+      $body .= $req->toBatchString($key)."\n\n";
+      $this->expected_classes["response-".$key] = $req->getExpectedClass();
     }
 
     $body .= "--{$this->boundary}--";
 
-    $url = $this->root_url . '/' . $this->batch_path;
+    $url = $this->root_url.'/'.$this->batch_path;
     $httpRequest = new Google_Http_Request($url, 'POST');
     $httpRequest->setRequestHeaders(
-        array('Content-Type' => 'multipart/mixed; boundary=' . $this->boundary)
+        array('Content-Type' => 'multipart/mixed; boundary='.$this->boundary)
     );
 
     $httpRequest->setPostBody($body);

geodirectory-admin/google-api-php-client/src/Google/Http/REST.php

Indentation +89 added lines, -89 removed lines

@@ -36,14 +36,14 @@ 
    */
   public static function execute(Google_Client $client, Google_Http_Request $req)
   {
-    $runner = new Google_Task_Runner(
-        $client,
-        sprintf('%s %s', $req->getRequestMethod(), $req->getUrl()),
-        array(get_class(), 'doExecute'),
-        array($client, $req)
-    );
+	$runner = new Google_Task_Runner(
+		$client,
+		sprintf('%s %s', $req->getRequestMethod(), $req->getUrl()),
+		array(get_class(), 'doExecute'),
+		array($client, $req)
+	);
 
-    return $runner->run();
+	return $runner->run();
   }
 
   /**
@@ -57,9 +57,9 @@ 
    */
   public static function doExecute(Google_Client $client, Google_Http_Request $req)
   {
-    $httpRequest = $client->getIo()->makeRequest($req);
-    $httpRequest->setExpectedClass($req->getExpectedClass());
-    return self::decodeHttpResponse($httpRequest, $client);
+	$httpRequest = $client->getIo()->makeRequest($req);
+	$httpRequest->setExpectedClass($req->getExpectedClass());
+	return self::decodeHttpResponse($httpRequest, $client);
   }
 
   /**
@@ -72,65 +72,65 @@ 
    */
   public static function decodeHttpResponse($response, Google_Client $client = null)
   {
-    $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 (isset($decoded['error']) &&
-          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 (isset($decoded['error']) &&
+		  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";
+	  }
 
-      $errors = null;
-      // Specific check for APIs which don't return error details, such as Blogger.
-      if (isset($decoded['error']) && isset($decoded['error']['errors'])) {
-        $errors = $decoded['error']['errors'];
-      }
+	  $errors = null;
+	  // Specific check for APIs which don't return error details, such as Blogger.
+	  if (isset($decoded['error']) && isset($decoded['error']['errors'])) {
+		$errors = $decoded['error']['errors'];
+	  }
 
-      $map = null;
-      if ($client) {
-        $client->getLogger()->error(
-            $err,
-            array('code' => $code, 'errors' => $errors)
-        );
+	  $map = null;
+	  if ($client) {
+		$client->getLogger()->error(
+			$err,
+			array('code' => $code, 'errors' => $errors)
+		);
 
-        $map = $client->getClassConfig(
-            'Google_Service_Exception',
-            'retry_map'
-        );
-      }
-      throw new Google_Service_Exception($err, $code, null, $errors, $map);
-    }
+		$map = $client->getClassConfig(
+			'Google_Service_Exception',
+			'retry_map'
+		);
+	  }
+	  throw new Google_Service_Exception($err, $code, null, $errors, $map);
+	}
 
-    // Only attempt to decode the response, if the response code wasn't (204) 'no content'
-    if ($code != '204') {
-      if ($response->getExpectedRaw()) {
-        return $body;
-      }
+	// Only attempt to decode the response, if the response code wasn't (204) 'no content'
+	if ($code != '204') {
+	  if ($response->getExpectedRaw()) {
+		return $body;
+	  }
       
-      $decoded = json_decode($body, true);
-      if ($decoded === null || $decoded === "") {
-        $error = "Invalid json in service response: $body";
-        if ($client) {
-          $client->getLogger()->error($error);
-        }
-        throw new Google_Service_Exception($error);
-      }
+	  $decoded = json_decode($body, true);
+	  if ($decoded === null || $decoded === "") {
+		$error = "Invalid json in service response: $body";
+		if ($client) {
+		  $client->getLogger()->error($error);
+		}
+		throw new Google_Service_Exception($error);
+	  }
 
-      if ($response->getExpectedClass()) {
-        $class = $response->getExpectedClass();
-        $decoded = new $class($decoded);
-      }
-    }
-    return $decoded;
+	  if ($response->getExpectedClass()) {
+		$class = $response->getExpectedClass();
+		$decoded = new $class($decoded);
+	  }
+	}
+	return $decoded;
   }
 
   /**
@@ -144,35 +144,35 @@ 
    */
   public static function createRequestUri($servicePath, $restPath, $params)
   {
-    $requestUrl = $servicePath . $restPath;
-    $uriTemplateVars = array();
-    $queryVars = array();
-    foreach ($params as $paramName => $paramSpec) {
-      if ($paramSpec['type'] == 'boolean') {
-        $paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
-      }
-      if ($paramSpec['location'] == 'path') {
-        $uriTemplateVars[$paramName] = $paramSpec['value'];
-      } else if ($paramSpec['location'] == 'query') {
-        if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
-          foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
-          }
-        } else {
-          $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
-        }
-      }
-    }
+	$requestUrl = $servicePath . $restPath;
+	$uriTemplateVars = array();
+	$queryVars = array();
+	foreach ($params as $paramName => $paramSpec) {
+	  if ($paramSpec['type'] == 'boolean') {
+		$paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
+	  }
+	  if ($paramSpec['location'] == 'path') {
+		$uriTemplateVars[$paramName] = $paramSpec['value'];
+	  } else if ($paramSpec['location'] == 'query') {
+		if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
+		  foreach ($paramSpec['value'] as $value) {
+			$queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
+		  }
+		} else {
+		  $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
+		}
+	  }
+	}
 
-    if (count($uriTemplateVars)) {
-      $uriTemplateParser = new Google_Utils_URITemplate();
-      $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
-    }
+	if (count($uriTemplateVars)) {
+	  $uriTemplateParser = new Google_Utils_URITemplate();
+	  $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
+	}
 
-    if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
-    }
+	if (count($queryVars)) {
+	  $requestUrl .= '?' . implode($queryVars, '&');
+	}
 
-    return $requestUrl;
+	return $requestUrl;
   }
 }

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -78,9 +78,9 @@ 
 
     if ((intVal($code)) >= 300) {
       $decoded = json_decode($body, true);
-      $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
+      $err = 'Error calling '.$response->getRequestMethod().' '.$response->getUrl();
       if (isset($decoded['error']) &&
-          isset($decoded['error']['message'])  &&
+          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
@@ -144,7 +144,7 @@ 
    */
   public static function createRequestUri($servicePath, $restPath, $params)
   {
-    $requestUrl = $servicePath . $restPath;
+    $requestUrl = $servicePath.$restPath;
     $uriTemplateVars = array();
     $queryVars = array();
     foreach ($params as $paramName => $paramSpec) {
@@ -156,10 +156,10 @@ 
       } else if ($paramSpec['location'] == 'query') {
         if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
           foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
+            $queryVars[] = $paramName.'='.rawurlencode(rawurldecode($value));
           }
         } else {
-          $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
+          $queryVars[] = $paramName.'='.rawurlencode(rawurldecode($paramSpec['value']));
         }
       }
     }
@@ -170,7 +170,7 @@ 
     }
 
     if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
+      $requestUrl .= '?'.implode($queryVars, '&');
     }
 
     return $requestUrl;

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

Indentation +92 added lines, -92 removed lines

@@ -34,13 +34,13 @@ 
 
   public function __construct(Google_Client $client)
   {
-    if (!extension_loaded('curl')) {
-      $error = 'The cURL IO handler requires the cURL extension to be enabled';
-      $client->getLogger()->critical($error);
-      throw new Google_IO_Exception($error);
-    }
+	if (!extension_loaded('curl')) {
+	  $error = 'The cURL IO handler requires the cURL extension to be enabled';
+	  $client->getLogger()->critical($error);
+	  throw new Google_IO_Exception($error);
+	}
 
-    parent::__construct($client);
+	parent::__construct($client);
   }
 
   /**
@@ -52,83 +52,83 @@ 
    */
   public function executeRequest(Google_Http_Request $request)
   {
-    $curl = curl_init();
-
-    if ($request->getPostBody()) {
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getPostBody());
-    }
-
-    $requestHeaders = $request->getRequestHeaders();
-    if ($requestHeaders && is_array($requestHeaders)) {
-      $curlHeaders = array();
-      foreach ($requestHeaders as $k => $v) {
-        $curlHeaders[] = "$k: $v";
-      }
-      curl_setopt($curl, CURLOPT_HTTPHEADER, $curlHeaders);
-    }
-    curl_setopt($curl, CURLOPT_URL, $request->getUrl());
-
-    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
-    curl_setopt($curl, CURLOPT_USERAGENT, $request->getUserAgent());
-
-    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
-    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-    // 1 is CURL_SSLVERSION_TLSv1, which is not always defined in PHP.
-    curl_setopt($curl, CURLOPT_SSLVERSION, 1);
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($curl, CURLOPT_HEADER, true);
-
-    if ($request->canGzip()) {
-      curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
-    }
+	$curl = curl_init();
+
+	if ($request->getPostBody()) {
+	  curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getPostBody());
+	}
+
+	$requestHeaders = $request->getRequestHeaders();
+	if ($requestHeaders && is_array($requestHeaders)) {
+	  $curlHeaders = array();
+	  foreach ($requestHeaders as $k => $v) {
+		$curlHeaders[] = "$k: $v";
+	  }
+	  curl_setopt($curl, CURLOPT_HTTPHEADER, $curlHeaders);
+	}
+	curl_setopt($curl, CURLOPT_URL, $request->getUrl());
+
+	curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
+	curl_setopt($curl, CURLOPT_USERAGENT, $request->getUserAgent());
+
+	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+	curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
+	// 1 is CURL_SSLVERSION_TLSv1, which is not always defined in PHP.
+	curl_setopt($curl, CURLOPT_SSLVERSION, 1);
+	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($curl, CURLOPT_HEADER, true);
+
+	if ($request->canGzip()) {
+	  curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
+	}
     
-    $options = $this->client->getClassConfig('Google_IO_Curl', 'options');
-    if (is_array($options)) {
-      $this->setOptions($options);
-    }
+	$options = $this->client->getClassConfig('Google_IO_Curl', 'options');
+	if (is_array($options)) {
+	  $this->setOptions($options);
+	}
     
-    foreach ($this->options as $key => $var) {
-      curl_setopt($curl, $key, $var);
-    }
-
-    if (!isset($this->options[CURLOPT_CAINFO])) {
-      curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
-    }
-
-    $this->client->getLogger()->debug(
-        'cURL request',
-        array(
-            'url' => $request->getUrl(),
-            'method' => $request->getRequestMethod(),
-            'headers' => $requestHeaders,
-            'body' => $request->getPostBody()
-        )
-    );
-
-    $response = curl_exec($curl);
-    if ($response === false) {
-      $error = curl_error($curl);
-      $code = curl_errno($curl);
-      $map = $this->client->getClassConfig('Google_IO_Exception', 'retry_map');
-
-      $this->client->getLogger()->error('cURL ' . $error);
-      throw new Google_IO_Exception($error, $code, null, $map);
-    }
-    $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-
-    list($responseHeaders, $responseBody) = $this->parseHttpResponse($response, $headerSize);
-    $responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-
-    $this->client->getLogger()->debug(
-        'cURL response',
-        array(
-            'code' => $responseCode,
-            'headers' => $responseHeaders,
-            'body' => $responseBody,
-        )
-    );
-
-    return array($responseBody, $responseHeaders, $responseCode);
+	foreach ($this->options as $key => $var) {
+	  curl_setopt($curl, $key, $var);
+	}
+
+	if (!isset($this->options[CURLOPT_CAINFO])) {
+	  curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+	}
+
+	$this->client->getLogger()->debug(
+		'cURL request',
+		array(
+			'url' => $request->getUrl(),
+			'method' => $request->getRequestMethod(),
+			'headers' => $requestHeaders,
+			'body' => $request->getPostBody()
+		)
+	);
+
+	$response = curl_exec($curl);
+	if ($response === false) {
+	  $error = curl_error($curl);
+	  $code = curl_errno($curl);
+	  $map = $this->client->getClassConfig('Google_IO_Exception', 'retry_map');
+
+	  $this->client->getLogger()->error('cURL ' . $error);
+	  throw new Google_IO_Exception($error, $code, null, $map);
+	}
+	$headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+
+	list($responseHeaders, $responseBody) = $this->parseHttpResponse($response, $headerSize);
+	$responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+	$this->client->getLogger()->debug(
+		'cURL response',
+		array(
+			'code' => $responseCode,
+			'headers' => $responseHeaders,
+			'body' => $responseBody,
+		)
+	);
+
+	return array($responseBody, $responseHeaders, $responseCode);
   }
 
   /**
@@ -137,7 +137,7 @@ 
    */
   public function setOptions($options)
   {
-    $this->options = $options + $this->options;
+	$this->options = $options + $this->options;
   }
 
   /**
@@ -146,12 +146,12 @@ 
    */
   public function setTimeout($timeout)
   {
-    // Since this timeout is really for putting a bound on the time
-    // we'll set them both to the same. If you need to specify a longer
-    // CURLOPT_TIMEOUT, or a higher CONNECTTIMEOUT, the best thing to
-    // do is use the setOptions method for the values individually.
-    $this->options[CURLOPT_CONNECTTIMEOUT] = $timeout;
-    $this->options[CURLOPT_TIMEOUT] = $timeout;
+	// Since this timeout is really for putting a bound on the time
+	// we'll set them both to the same. If you need to specify a longer
+	// CURLOPT_TIMEOUT, or a higher CONNECTTIMEOUT, the best thing to
+	// do is use the setOptions method for the values individually.
+	$this->options[CURLOPT_CONNECTTIMEOUT] = $timeout;
+	$this->options[CURLOPT_TIMEOUT] = $timeout;
   }
 
   /**
@@ -160,7 +160,7 @@ 
    */
   public function getTimeout()
   {
-    return $this->options[CURLOPT_TIMEOUT];
+	return $this->options[CURLOPT_TIMEOUT];
   }
 
   /**
@@ -172,8 +172,8 @@ 
    */
   protected function needsQuirk()
   {
-    $ver = curl_version();
-    $versionNum = $ver['version_number'];
-    return $versionNum < Google_IO_Curl::NO_QUIRK_VERSION;
+	$ver = curl_version();
+	$versionNum = $ver['version_number'];
+	return $versionNum < Google_IO_Curl::NO_QUIRK_VERSION;
   }
 }

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 class Google_IO_Curl extends Google_IO_Abstract
@@ -92,7 +92,7 @@ 
     }
 
     if (!isset($this->options[CURLOPT_CAINFO])) {
-      curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+      curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__).'/cacerts.pem');
     }
 
     $this->client->getLogger()->debug(
@@ -111,7 +111,7 @@ 
       $code = curl_errno($curl);
       $map = $this->client->getClassConfig('Google_IO_Exception', 'retry_map');
 
-      $this->client->getLogger()->error('cURL ' . $error);
+      $this->client->getLogger()->error('cURL '.$error);
       throw new Google_IO_Exception($error, $code, null, $map);
     }
     $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);

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

Indentation +140 added lines, -140 removed lines

@@ -34,24 +34,24 @@ 
   private $trappedErrorString;
 
   private static $DEFAULT_HTTP_CONTEXT = array(
-    "follow_location" => 0,
-    "ignore_errors" => 1,
+	"follow_location" => 0,
+	"ignore_errors" => 1,
   );
 
   private static $DEFAULT_SSL_CONTEXT = array(
-    "verify_peer" => true,
+	"verify_peer" => true,
   );
 
   public function __construct(Google_Client $client)
   {
-    if (!ini_get('allow_url_fopen')) {
-      $error = 'The stream IO handler requires the allow_url_fopen runtime ' .
-               'configuration to be enabled';
-      $client->getLogger()->critical($error);
-      throw new Google_IO_Exception($error);
-    }
-
-    parent::__construct($client);
+	if (!ini_get('allow_url_fopen')) {
+	  $error = 'The stream IO handler requires the allow_url_fopen runtime ' .
+			   'configuration to be enabled';
+	  $client->getLogger()->critical($error);
+	  throw new Google_IO_Exception($error);
+	}
+
+	parent::__construct($client);
   }
 
   /**
@@ -63,119 +63,119 @@ 
    */
   public function executeRequest(Google_Http_Request $request)
   {
-    $default_options = stream_context_get_options(stream_context_get_default());
-
-    $requestHttpContext = array_key_exists('http', $default_options) ?
-        $default_options['http'] : array();
-
-    if ($request->getPostBody()) {
-      $requestHttpContext["content"] = $request->getPostBody();
-    }
-
-    $requestHeaders = $request->getRequestHeaders();
-    if ($requestHeaders && is_array($requestHeaders)) {
-      $headers = "";
-      foreach ($requestHeaders as $k => $v) {
-        $headers .= "$k: $v\r\n";
-      }
-      $requestHttpContext["header"] = $headers;
-    }
-
-    $requestHttpContext["method"] = $request->getRequestMethod();
-    $requestHttpContext["user_agent"] = $request->getUserAgent();
-
-    $requestSslContext = array_key_exists('ssl', $default_options) ?
-        $default_options['ssl'] : array();
-
-    if (!array_key_exists("cafile", $requestSslContext)) {
-      $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
-    }
-
-    $options = array(
-        "http" => array_merge(
-            self::$DEFAULT_HTTP_CONTEXT,
-            $requestHttpContext
-        ),
-        "ssl" => array_merge(
-            self::$DEFAULT_SSL_CONTEXT,
-            $requestSslContext
-        )
-    );
-
-    $context = stream_context_create($options);
-
-    $url = $request->getUrl();
-
-    if ($request->canGzip()) {
-      $url = self::ZLIB . $url;
-    }
-
-    $this->client->getLogger()->debug(
-        'Stream request',
-        array(
-            'url' => $url,
-            'method' => $request->getRequestMethod(),
-            'headers' => $requestHeaders,
-            'body' => $request->getPostBody()
-        )
-    );
-
-    // We are trapping any thrown errors in this method only and
-    // throwing an exception.
-    $this->trappedErrorNumber = null;
-    $this->trappedErrorString = null;
-
-    // START - error trap.
-    set_error_handler(array($this, 'trapError'));
-    $fh = fopen($url, 'r', false, $context);
-    restore_error_handler();
-    // END - error trap.
-
-    if ($this->trappedErrorNumber) {
-      $error = sprintf(
-          "HTTP Error: Unable to connect: '%s'",
-          $this->trappedErrorString
-      );
-
-      $this->client->getLogger()->error('Stream ' . $error);
-      throw new Google_IO_Exception($error, $this->trappedErrorNumber);
-    }
-
-    $response_data = false;
-    $respHttpCode = self::UNKNOWN_CODE;
-    if ($fh) {
-      if (isset($this->options[self::TIMEOUT])) {
-        stream_set_timeout($fh, $this->options[self::TIMEOUT]);
-      }
-
-      $response_data = stream_get_contents($fh);
-      fclose($fh);
-
-      $respHttpCode = $this->getHttpResponseCode($http_response_header);
-    }
-
-    if (false === $response_data) {
-      $error = sprintf(
-          "HTTP Error: Unable to connect: '%s'",
-          $respHttpCode
-      );
-
-      $this->client->getLogger()->error('Stream ' . $error);
-      throw new Google_IO_Exception($error, $respHttpCode);
-    }
-
-    $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
-
-    $this->client->getLogger()->debug(
-        'Stream response',
-        array(
-            'code' => $respHttpCode,
-            'headers' => $responseHeaders,
-            'body' => $response_data,
-        )
-    );
-
-    return array($response_data, $responseHeaders, $respHttpCode);
+	$default_options = stream_context_get_options(stream_context_get_default());
+
+	$requestHttpContext = array_key_exists('http', $default_options) ?
+		$default_options['http'] : array();
+
+	if ($request->getPostBody()) {
+	  $requestHttpContext["content"] = $request->getPostBody();
+	}
+
+	$requestHeaders = $request->getRequestHeaders();
+	if ($requestHeaders && is_array($requestHeaders)) {
+	  $headers = "";
+	  foreach ($requestHeaders as $k => $v) {
+		$headers .= "$k: $v\r\n";
+	  }
+	  $requestHttpContext["header"] = $headers;
+	}
+
+	$requestHttpContext["method"] = $request->getRequestMethod();
+	$requestHttpContext["user_agent"] = $request->getUserAgent();
+
+	$requestSslContext = array_key_exists('ssl', $default_options) ?
+		$default_options['ssl'] : array();
+
+	if (!array_key_exists("cafile", $requestSslContext)) {
+	  $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
+	}
+
+	$options = array(
+		"http" => array_merge(
+			self::$DEFAULT_HTTP_CONTEXT,
+			$requestHttpContext
+		),
+		"ssl" => array_merge(
+			self::$DEFAULT_SSL_CONTEXT,
+			$requestSslContext
+		)
+	);
+
+	$context = stream_context_create($options);
+
+	$url = $request->getUrl();
+
+	if ($request->canGzip()) {
+	  $url = self::ZLIB . $url;
+	}
+
+	$this->client->getLogger()->debug(
+		'Stream request',
+		array(
+			'url' => $url,
+			'method' => $request->getRequestMethod(),
+			'headers' => $requestHeaders,
+			'body' => $request->getPostBody()
+		)
+	);
+
+	// We are trapping any thrown errors in this method only and
+	// throwing an exception.
+	$this->trappedErrorNumber = null;
+	$this->trappedErrorString = null;
+
+	// START - error trap.
+	set_error_handler(array($this, 'trapError'));
+	$fh = fopen($url, 'r', false, $context);
+	restore_error_handler();
+	// END - error trap.
+
+	if ($this->trappedErrorNumber) {
+	  $error = sprintf(
+		  "HTTP Error: Unable to connect: '%s'",
+		  $this->trappedErrorString
+	  );
+
+	  $this->client->getLogger()->error('Stream ' . $error);
+	  throw new Google_IO_Exception($error, $this->trappedErrorNumber);
+	}
+
+	$response_data = false;
+	$respHttpCode = self::UNKNOWN_CODE;
+	if ($fh) {
+	  if (isset($this->options[self::TIMEOUT])) {
+		stream_set_timeout($fh, $this->options[self::TIMEOUT]);
+	  }
+
+	  $response_data = stream_get_contents($fh);
+	  fclose($fh);
+
+	  $respHttpCode = $this->getHttpResponseCode($http_response_header);
+	}
+
+	if (false === $response_data) {
+	  $error = sprintf(
+		  "HTTP Error: Unable to connect: '%s'",
+		  $respHttpCode
+	  );
+
+	  $this->client->getLogger()->error('Stream ' . $error);
+	  throw new Google_IO_Exception($error, $respHttpCode);
+	}
+
+	$responseHeaders = $this->getHttpResponseHeaders($http_response_header);
+
+	$this->client->getLogger()->debug(
+		'Stream response',
+		array(
+			'code' => $respHttpCode,
+			'headers' => $responseHeaders,
+			'body' => $response_data,
+		)
+	);
+
+	return array($response_data, $responseHeaders, $respHttpCode);
   }
 
   /**
@@ -184,7 +184,7 @@ 
    */
   public function setOptions($options)
   {
-    $this->options = $options + $this->options;
+	$this->options = $options + $this->options;
   }
 
   /**
@@ -193,8 +193,8 @@ 
    */
   public function trapError($errno, $errstr)
   {
-    $this->trappedErrorNumber = $errno;
-    $this->trappedErrorString = $errstr;
+	$this->trappedErrorNumber = $errno;
+	$this->trappedErrorString = $errstr;
   }
 
   /**
@@ -203,7 +203,7 @@ 
    */
   public function setTimeout($timeout)
   {
-    $this->options[self::TIMEOUT] = $timeout;
+	$this->options[self::TIMEOUT] = $timeout;
   }
 
   /**
@@ -212,7 +212,7 @@ 
    */
   public function getTimeout()
   {
-    return $this->options[self::TIMEOUT];
+	return $this->options[self::TIMEOUT];
   }
 
   /**
@@ -224,20 +224,20 @@ 
    */
   protected function needsQuirk()
   {
-    return false;
+	return false;
   }
 
   protected function getHttpResponseCode($response_headers)
   {
-    $header_count = count($response_headers);
-
-    for ($i = 0; $i < $header_count; $i++) {
-      $header = $response_headers[$i];
-      if (strncasecmp("HTTP", $header, strlen("HTTP")) == 0) {
-        $response = explode(' ', $header);
-        return $response[1];
-      }
-    }
-    return self::UNKNOWN_CODE;
+	$header_count = count($response_headers);
+
+	for ($i = 0; $i < $header_count; $i++) {
+	  $header = $response_headers[$i];
+	  if (strncasecmp("HTTP", $header, strlen("HTTP")) == 0) {
+		$response = explode(' ', $header);
+		return $response[1];
+	  }
+	}
+	return self::UNKNOWN_CODE;
   }
 }

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 class Google_IO_Stream extends Google_IO_Abstract
@@ -45,7 +45,7 @@ 
   public function __construct(Google_Client $client)
   {
     if (!ini_get('allow_url_fopen')) {
-      $error = 'The stream IO handler requires the allow_url_fopen runtime ' .
+      $error = 'The stream IO handler requires the allow_url_fopen runtime '.
                'configuration to be enabled';
       $client->getLogger()->critical($error);
       throw new Google_IO_Exception($error);
@@ -88,7 +88,7 @@ 
         $default_options['ssl'] : array();
 
     if (!array_key_exists("cafile", $requestSslContext)) {
-      $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
+      $requestSslContext["cafile"] = dirname(__FILE__).'/cacerts.pem';
     }
 
     $options = array(
@@ -107,7 +107,7 @@ 
     $url = $request->getUrl();
 
     if ($request->canGzip()) {
-      $url = self::ZLIB . $url;
+      $url = self::ZLIB.$url;
     }
 
     $this->client->getLogger()->debug(
@@ -137,7 +137,7 @@ 
           $this->trappedErrorString
       );
 
-      $this->client->getLogger()->error('Stream ' . $error);
+      $this->client->getLogger()->error('Stream '.$error);
       throw new Google_IO_Exception($error, $this->trappedErrorNumber);
     }
 
@@ -160,7 +160,7 @@ 
           $respHttpCode
       );
 
-      $this->client->getLogger()->error('Stream ' . $error);
+      $this->client->getLogger()->error('Stream '.$error);
       throw new Google_IO_Exception($error, $respHttpCode);
     }
 

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

Indentation +16 added lines, -16 removed lines

@@ -35,20 +35,20 @@ 
    * @param array|null $retryMap Map of errors with retry counts.
    */
   public function __construct(
-      $message,
-      $code = 0,
-      Exception $previous = null,
-      array $retryMap = null
+	  $message,
+	  $code = 0,
+	  Exception $previous = null,
+	  array $retryMap = null
   ) {
-    if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-      parent::__construct($message, $code, $previous);
-    } else {
-      parent::__construct($message, $code);
-    }
+	if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+	  parent::__construct($message, $code, $previous);
+	} else {
+	  parent::__construct($message, $code);
+	}
 
-    if (is_array($retryMap)) {
-      $this->retryMap = $retryMap;
-    }
+	if (is_array($retryMap)) {
+	  $this->retryMap = $retryMap;
+	}
   }
 
   /**
@@ -60,10 +60,10 @@ 
    */
   public function allowedRetries()
   {
-    if (isset($this->retryMap[$this->code])) {
-      return $this->retryMap[$this->code];
-    }
+	if (isset($this->retryMap[$this->code])) {
+	  return $this->retryMap[$this->code];
+	}
 
-    return 0;
+	return 0;
   }
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 class Google_IO_Exception extends Google_Exception implements Google_Task_Retryable

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

Indentation +165 added lines, -165 removed lines

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

Spacing +3 added lines, -4 removed lines

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

geodirectory-functions/compatibility/Twenty_Seventeen.php

Spacing +9 added lines, -9 removed lines

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

Braces +4 added lines, -8 removed lines

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

geodirectory-admin/option-pages/create_field.php

Indentation +65 added lines, -65 removed lines

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

Spacing +8 added lines, -8 removed lines

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

Braces +12 added lines, -8 removed lines

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

geodirectory-functions/map-functions/map_template_tags.php

Braces +8 added lines, -6 removed lines

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

                 <?php }

 

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

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

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

 

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

@@ -302,8 +303,9 @@ 
 				}

 				

 				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

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

                 global $gd_session;

                 $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

Indentation +145 added lines, -145 removed lines

@@ -67,80 +67,80 @@ 
  */

 function geodir_draw_map($map_args = array())

 {

-    global $map_canvas_arr;

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

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

-

-    $default_location = geodir_get_default_location();

-

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

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

-    $map_default_zoom = 12;

-    // map options default values

-    $width = 950;

-    $height = 450;

-    $child_collapse = '0';

-    $sticky = '';

-    $enable_cat_filters = false;

-    $enable_text_search = false;

-    $enable_post_type_filters = false;

-    $enable_location_filters = false;

-    $enable_jason_on_load = false;

-    $enable_map_direction = false;

-    $enable_marker_cluster = false;

-    $enable_map_resize_button = false;

-    $maptype = 'ROADMAP';

-

-    $geodir_map_options = array(

-        'width' => $width,

-        'height' => $height,

-        'child_collapse' => $child_collapse,

-        'sticky' => $sticky,

-        'enable_map_resize_button' => $enable_map_resize_button,

-        'enable_cat_filters' => $enable_cat_filters,

-        'enable_text_search' => $enable_text_search,

-        'enable_post_type_filters' => $enable_post_type_filters,

-        'enable_location_filters' => $enable_location_filters,

-        'enable_jason_on_load' => $enable_jason_on_load,

-        'enable_map_direction' => $enable_map_direction,

-        'enable_marker_cluster' => $enable_marker_cluster,

-        'ajax_url' => geodir_get_ajax_url(),

-        'map_canvas_name' => $map_canvas_name,

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

-        'latitude' => $map_default_lat,

-        'longitude' => $map_default_lng,

-        'zoom' => $map_default_zoom,

-        'scrollwheel' => true,

-        'streetViewControl' => true,

-        'fullscreenControl' => false,

-        'maptype' => $maptype,

-        'showPreview' => '0',

-        'maxZoom' => 21,

-        'autozoom' => true,

-        'bubble_size' => 'small',

-        'token' => '68f48005e256696074e1da9bf9f67f06',

-        'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

-    );

-

-

-

-    if (!empty($map_args)) {

-        foreach ($map_args as $map_option_key => $map_option_value) {

-            $geodir_map_options[$map_option_key] = $map_option_value;

-        }

-    }

-

-    if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

-    } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

-    }

-

-    if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

-    } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

-    }

-

-    /**

+	global $map_canvas_arr;

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

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

+

+	$default_location = geodir_get_default_location();

+

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

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

+	$map_default_zoom = 12;

+	// map options default values

+	$width = 950;

+	$height = 450;

+	$child_collapse = '0';

+	$sticky = '';

+	$enable_cat_filters = false;

+	$enable_text_search = false;

+	$enable_post_type_filters = false;

+	$enable_location_filters = false;

+	$enable_jason_on_load = false;

+	$enable_map_direction = false;

+	$enable_marker_cluster = false;

+	$enable_map_resize_button = false;

+	$maptype = 'ROADMAP';

+

+	$geodir_map_options = array(

+		'width' => $width,

+		'height' => $height,

+		'child_collapse' => $child_collapse,

+		'sticky' => $sticky,

+		'enable_map_resize_button' => $enable_map_resize_button,

+		'enable_cat_filters' => $enable_cat_filters,

+		'enable_text_search' => $enable_text_search,

+		'enable_post_type_filters' => $enable_post_type_filters,

+		'enable_location_filters' => $enable_location_filters,

+		'enable_jason_on_load' => $enable_jason_on_load,

+		'enable_map_direction' => $enable_map_direction,

+		'enable_marker_cluster' => $enable_marker_cluster,

+		'ajax_url' => geodir_get_ajax_url(),

+		'map_canvas_name' => $map_canvas_name,

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

+		'latitude' => $map_default_lat,

+		'longitude' => $map_default_lng,

+		'zoom' => $map_default_zoom,

+		'scrollwheel' => true,

+		'streetViewControl' => true,

+		'fullscreenControl' => false,

+		'maptype' => $maptype,

+		'showPreview' => '0',

+		'maxZoom' => 21,

+		'autozoom' => true,

+		'bubble_size' => 'small',

+		'token' => '68f48005e256696074e1da9bf9f67f06',

+		'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

+	);

+

+

+

+	if (!empty($map_args)) {

+		foreach ($map_args as $map_option_key => $map_option_value) {

+			$geodir_map_options[$map_option_key] = $map_option_value;

+		}

+	}

+

+	if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

+	} else {

+		$geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+	}

+

+	if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

+	} else {

+		$geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+	}

+

+	/**

 	 * Filter the options to use in google map.

 	 *

 	 * @since 1.0.0

@@ -149,9 +149,9 @@ 
 	 */

 	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

-    $map_canvas_arr[$map_canvas_name] = array();

+	$map_canvas_arr[$map_canvas_name] = array();

 

-    /**

+	/**

 	 * Filter the post types to display data on map.

 	 *

 	 * @since 1.0.0

@@ -169,20 +169,20 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

-        // Set default map options

+	if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+		// Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+		wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

 

-        wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

+		wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

-        if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

-            $map_width = '100%';

-        } else {

-            $map_width = $geodir_map_options['width'];

-        }

+		if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

+			$map_width = '100%';

+		} else {

+			$map_width = $geodir_map_options['width'];

+		}

 

-        /**

+		/**

 		 * Filter the width of map.

 		 *

 		 * @since 1.0.0

@@ -190,7 +190,7 @@ 
 		 * @param int $map_width Width of map box, eg: gd_place.

 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

-        ?>

+		?>

         <div id="catcher_<?php echo $map_canvas_name;?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

@@ -224,15 +224,15 @@ 
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

                 <?php } else {

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

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

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

-                ?>

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

+					$show_entire_cat_panel = "none";

+				else

+					$show_entire_cat_panel = "''";

+				?>

 

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

                     <div class="gd-input-group gd-get-directions">

@@ -295,8 +295,8 @@ 
                         <select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">

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

                             <option <?php if (get_option('geodir_search_dist_1') == 'km') {

-                                echo 'selected="selected"';

-                            } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

+								echo 'selected="selected"';

+							} ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

                         </select>

                     </div>

 

@@ -308,12 +308,12 @@ 
 				if (empty($geodir_default_map_search_pt))

 					$geodir_default_map_search_pt = 'gd_place';

 

-                global $gd_session;

-                $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

+				global $gd_session;

+				$homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

 

-                if ($homemap_catlist_ptype) {

-                    $geodir_default_map_search_pt = $homemap_catlist_ptype;

-                }

+				if ($homemap_catlist_ptype) {

+					$geodir_default_map_search_pt = $homemap_catlist_ptype;

+				}

 

 				/**

 				 * Filter the post type to retrieve data for map

@@ -326,13 +326,13 @@ 
 				?>

                 <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

                     <?php

-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

-                    $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+					$geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

 					$map_cat_class = '';

 					if ($geodir_map_options['enable_post_type_filters']) {

 						$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

 					}

-                    ?>

+					?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

                         <div class="gd-trigger gd-triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

@@ -350,7 +350,7 @@ 
                                 <?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>

                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

-                                    ?>

+									?>

                                     <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

@@ -372,18 +372,18 @@ 
                 <!-- map-category-listings-->

 

                 <?php

-                if ($geodir_map_options['enable_location_filters']) {

-                    $country = get_query_var('gd_country');

+				if ($geodir_map_options['enable_location_filters']) {

+					$country = get_query_var('gd_country');

 					$region = get_query_var('gd_region');

 					$city = get_query_var('gd_city');

-                    $gd_neighbourhood = get_query_var('gd_neighbourhood');

+					$gd_neighbourhood = get_query_var('gd_neighbourhood');

                     

-                    //fix for location/me page

-                    $country = $country != 'me' ? $country : '';

+					//fix for location/me page

+					$country = $country != 'me' ? $country : '';

 					$region = $region != 'me' ? $region : '';

 					$city = $country != 'me' ? $city : '';

-                    $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

-                    ?>

+					$gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

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

@@ -394,7 +394,7 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

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

                 <?php } else { //end of location filter

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

                 <?php }?>

 

@@ -405,16 +405,16 @@ 
 

 

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

-                    $post_types = geodir_get_posttypes('object');

-                    $all_post_types = geodir_get_posttypes('names');

-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

-                    if (is_array($exclude_post_types)) {

-                        $map_post_types = array_diff($all_post_types, $exclude_post_types);

-                    } else {

-                        $map_post_types = $all_post_types;

-                    }

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

-                        ?>

+					$post_types = geodir_get_posttypes('object');

+					$all_post_types = geodir_get_posttypes('names');

+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+					if (is_array($exclude_post_types)) {

+						$map_post_types = array_diff($all_post_types, $exclude_post_types);

+					} else {

+						$map_post_types = $all_post_types;

+					}

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

+						?>

                         <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

                              style="max-width:<?php echo $map_width;?>!important;">

 

@@ -424,13 +424,13 @@ 
                                     <?php

 

 

-                                    foreach ($post_types as $post_type => $args) {

-                                        if (!in_array($post_type, $exclude_post_types)) {

-                                            $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

+									foreach ($post_types as $post_type => $args) {

+										if (!in_array($post_type, $exclude_post_types)) {

+											$class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

 											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>';

-                                        }

-                                    }

-                                    ?>

+										}

+									}

+									?>

                                 </ul>

                                 <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             </div><?php } ?>

@@ -444,8 +444,8 @@ 
 

                         </div> <!-- map-places-listings-->

                     <?php }

-                } // end of post type filter if

-                ?>

+				} // end of post type filter if

+				?>

 

             </div>

         </div> <!--end of stick trigger container-->

@@ -460,8 +460,8 @@ 
         </script>

         <?php

 

-        if (strpos($geodir_map_options['height'], 'vh')) {

-            ?>

+		if (strpos($geodir_map_options['height'], 'vh')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -483,8 +483,8 @@ 
 

         <?php

 

-        } elseif (strpos($geodir_map_options['height'], 'px')) {

-            ?>

+		} elseif (strpos($geodir_map_options['height'], 'px')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -499,20 +499,20 @@ 
                 }());

             </script>

         <?php

-        }

+		}

 

-        /**

-         * Action that runs after all the map code has been output;

-         *

-         * @since 1.5.3

-         *

-         * @param array $geodir_map_options Array of map settings.

-         * @param string $map_canvas_name The canvas name and ID for the map.

-         */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+		/**

+		 * Action that runs after all the map code has been output;

+		 *

+		 * @since 1.5.3

+		 *

+		 * @param array $geodir_map_options Array of map settings.

+		 * @param string $map_canvas_name The canvas name and ID for the map.

+		 */

+		do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

 

 

-    endif; // Exclude posttypes if end

+	endif; // Exclude posttypes if end

 }

 

 /**

Spacing +61 added lines, -61 removed lines

@@ -132,12 +132,12 @@ 
 

     if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

     } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+        $geodir_map_options['height'] = $geodir_map_options['height'].'px';

     }

 

     if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

     } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+        $geodir_map_options['width'] = $geodir_map_options['width'].'px';

     }

 

     /**

@@ -169,10 +169,10 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+    if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+        wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);

 

         wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

@@ -191,41 +191,41 @@ 
 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

-        <div id="catcher_<?php echo $map_canvas_name;?>"></div>

+        <div id="catcher_<?php echo $map_canvas_name; ?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

-            <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"

-                 id="sticky_map_<?php echo $map_canvas_name;?>"

-                 style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+            <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"

+                 id="sticky_map_<?php echo $map_canvas_name; ?>"

+                 style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

 

                 <div class="map_background">

                     <div class="top_banner_section_in clearfix">

-                        <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

-                        <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>

-                        <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"

-                             style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+                        <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>

+                        <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>

+                        <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"

+                             style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

                             <!-- new map start -->

                             <div class="iprelative">

-                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"

-                                     style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

-                                <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"

-                                     style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

+                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"

+                                     style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

+                                <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"

+                                     style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

                                 <!--<div id="home_map_counter"></div>        -->

-                                <div id="<?php echo $map_canvas_name;?>_map_nofound"

+                                <div id="<?php echo $map_canvas_name; ?>_map_nofound"

                                      class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-                                <div id="<?php echo $map_canvas_name;?>_map_notloaded"

+                                <div id="<?php echo $map_canvas_name; ?>_map_notloaded"

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

                             </div>

                             <!-- new map end -->

                         </div>

-                        <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>

+                        <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>

                     </div>

                 </div>

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>

                 <?php } else {

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>

                 <?php }

 

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

@@ -245,7 +245,7 @@ 
                       <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>

                     </div>

                     <script>

-                        <?php if(geodir_is_page('detail')){?>

+                        <?php if (geodir_is_page('detail')) {?>

                         jQuery(function () {

                             gd_initialize_ac();

                         });

@@ -256,7 +256,7 @@ 
                                 // Create the autocomplete object, restricting the search

                                 // to geographical location types.

                                 autocomplete = new google.maps.places.Autocomplete(

-                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),

+                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),

                                     {types: ['geocode']});

                                 // When the user selects an address from the dropdown,

                                 // populate the address fields in the form.

@@ -270,7 +270,7 @@ 
                                 

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

                                     window.setTimeout(function() {

-                                        calcRoute('<?php echo $map_canvas_name;?>');

+                                        calcRoute('<?php echo $map_canvas_name; ?>');

                                     }, 1000);

                                 }

                             }

@@ -324,7 +324,7 @@ 
 				 */

 				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

 				?>

-                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

+                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

@@ -334,12 +334,12 @@ 
 					}

                     ?>

                     <div

-                        class="map-category-listing<?php echo $map_cat_class;?>">

+                        class="map-category-listing<?php echo $map_cat_class; ?>">

                         <div class="gd-trigger gd-triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div>

-                        <div id="<?php echo $map_canvas_name;?>_cat"

-                             class="<?php echo $map_canvas_name;?>_map_category  map_category"

-                             <?php if ($child_collapse){ ?>checked="checked" <?php }?>

-                             style="max-height:<?php echo $geodir_map_options['height'];?>;">

+                        <div id="<?php echo $map_canvas_name; ?>_cat"

+                             class="<?php echo $map_canvas_name; ?>_map_category  map_category"

+                             <?php if ($child_collapse) { ?>checked="checked" <?php }?>

+                             style="max-height:<?php echo $geodir_map_options['height']; ?>;">

                             <input

                                 onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"

                                 type="text"

@@ -351,11 +351,11 @@ 
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

                                     ?>

-                                    <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

+                                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

                                 <div class="geodir_toggle">

-                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>

+                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>

                                     <script>jQuery( document ).ready(function() {

                                             geodir_show_sub_cat_collapse_button();

                                         });</script>

@@ -384,21 +384,21 @@ 
 					$city = $country != 'me' ? $city : '';

                     $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"

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

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"

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

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"

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

                 <?php } else { //end of location filter

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>

                 <?php }?>

 

-                <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>

+                <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>

 

                 <input type="hidden" name="limitstart" value=""/>

 

@@ -415,8 +415,8 @@ 
                     }

                     if (count($map_post_types) > 1) {

                         ?>

-                        <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

-                             style="max-width:<?php echo $map_width;?>!important;">

+                        <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"

+                             style="max-width:<?php echo $map_width; ?>!important;">

 

                             <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             <div class="geodir-map-posttype-list"><?php } ?>

@@ -427,7 +427,7 @@ 
                                     foreach ($post_types as $post_type => $args) {

                                         if (!in_array($post_type, $exclude_post_types)) {

                                             $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

-											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>';

+											echo '<li id="'.$post_type.'" '.$class.'><a href="javascript:void(0);" onclick="jQuery(\'#'.$map_canvas_name.'_posttype\').val(\''.$post_type.'\');build_map_ajax_search_param(\''.$map_canvas_name.'\', true)">'.__($args->labels->name, 'geodirectory').'</a></li>';

                                         }

                                     }

                                     ?>

@@ -452,8 +452,8 @@ 
         <script type="text/javascript">

 

             jQuery(document).ready(function () {

-                build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);

-                map_sticky('<?php echo $map_canvas_name;?>');

+                build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);

+                map_sticky('<?php echo $map_canvas_name; ?>');

             });

 

         </script>

@@ -464,18 +464,18 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";

 

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

+                    jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

 

                 }());

             </script>

@@ -487,13 +487,13 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');

 

                 }());

             </script>

@@ -508,7 +508,7 @@ 
          * @param array $geodir_map_options Array of map settings.

          * @param string $map_canvas_name The canvas name and ID for the map.

          */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+        do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);

 

 

     endif; // Exclude posttypes if end