GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/Google/Auth/AssertionCredentials.php

Indentation +52 added lines, -52 removed lines

@@ -51,22 +51,22 @@ 
    *              automatic caching of the generated token.
    */
   public function __construct(
-      $serviceAccountName,
-      $scopes,
-      $privateKey,
-      $privateKeyPassword = 'notasecret',
-      $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
-      $sub = false,
-      $useCache = true
+	  $serviceAccountName,
+	  $scopes,
+	  $privateKey,
+	  $privateKeyPassword = 'notasecret',
+	  $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
+	  $sub = false,
+	  $useCache = true
   ) {
-    $this->serviceAccountName = $serviceAccountName;
-    $this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
-    $this->privateKey = $privateKey;
-    $this->privateKeyPassword = $privateKeyPassword;
-    $this->assertionType = $assertionType;
-    $this->sub = $sub;
-    $this->prn = $sub;
-    $this->useCache = $useCache;
+	$this->serviceAccountName = $serviceAccountName;
+	$this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
+	$this->privateKey = $privateKey;
+	$this->privateKeyPassword = $privateKeyPassword;
+	$this->assertionType = $assertionType;
+	$this->sub = $sub;
+	$this->prn = $sub;
+	$this->useCache = $useCache;
   }
   
   /**
@@ -75,36 +75,36 @@ 
    */
   public function getCacheKey()
   {
-    if (!$this->useCache) {
-      return false;
-    }
-    $h = $this->sub;
-    $h .= $this->assertionType;
-    $h .= $this->privateKey;
-    $h .= $this->scopes;
-    $h .= $this->serviceAccountName;
-    return md5($h);
+	if (!$this->useCache) {
+	  return false;
+	}
+	$h = $this->sub;
+	$h .= $this->assertionType;
+	$h .= $this->privateKey;
+	$h .= $this->scopes;
+	$h .= $this->serviceAccountName;
+	return md5($h);
   }
 
   public function generateAssertion()
   {
-    $now = time();
+	$now = time();
 
-    $jwtParams = array(
-          'aud' => Google_Auth_OAuth2::OAUTH2_TOKEN_URI,
-          'scope' => $this->scopes,
-          'iat' => $now,
-          'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
-          'iss' => $this->serviceAccountName,
-    );
+	$jwtParams = array(
+		  'aud' => Google_Auth_OAuth2::OAUTH2_TOKEN_URI,
+		  'scope' => $this->scopes,
+		  'iat' => $now,
+		  'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
+		  'iss' => $this->serviceAccountName,
+	);
 
-    if ($this->sub !== false) {
-      $jwtParams['sub'] = $this->sub;
-    } else if ($this->prn !== false) {
-      $jwtParams['prn'] = $this->prn;
-    }
+	if ($this->sub !== false) {
+	  $jwtParams['sub'] = $this->sub;
+	} else if ($this->prn !== false) {
+	  $jwtParams['prn'] = $this->prn;
+	}
 
-    return $this->makeSignedJwt($jwtParams);
+	return $this->makeSignedJwt($jwtParams);
   }
 
   /**
@@ -114,23 +114,23 @@ 
    */
   private function makeSignedJwt($payload)
   {
-    $header = array('typ' => 'JWT', 'alg' => 'RS256');
+	$header = array('typ' => 'JWT', 'alg' => 'RS256');
 
-    $payload = json_encode($payload);
-    // Handle some overzealous escaping in PHP json that seemed to cause some errors
-    // with claimsets.
-    $payload = str_replace('\/', '/', $payload);
+	$payload = json_encode($payload);
+	// Handle some overzealous escaping in PHP json that seemed to cause some errors
+	// with claimsets.
+	$payload = str_replace('\/', '/', $payload);
 
-    $segments = array(
-      Google_Utils::urlSafeB64Encode(json_encode($header)),
-      Google_Utils::urlSafeB64Encode($payload)
-    );
+	$segments = array(
+	  Google_Utils::urlSafeB64Encode(json_encode($header)),
+	  Google_Utils::urlSafeB64Encode($payload)
+	);
 
-    $signingInput = implode('.', $segments);
-    $signer = new Google_Signer_P12($this->privateKey, $this->privateKeyPassword);
-    $signature = $signer->sign($signingInput);
-    $segments[] = Google_Utils::urlSafeB64Encode($signature);
+	$signingInput = implode('.', $segments);
+	$signer = new Google_Signer_P12($this->privateKey, $this->privateKeyPassword);
+	$signature = $signer->sign($signingInput);
+	$segments[] = Google_Utils::urlSafeB64Encode($signature);
 
-    return implode(".", $segments);
+	return implode(".", $segments);
   }
 }

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

geodirectory-admin/google-api-php-client/src/Google/Auth/AppIdentity.php

Indentation +38 added lines, -38 removed lines

@@ -38,7 +38,7 @@ 
 
   public function __construct(Google_Client $client, $config = null)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -46,27 +46,27 @@ 
    */
   public function authenticateForScope($scopes)
   {
-    if ($this->token && $this->tokenScopes == $scopes) {
-      return $this->token;
-    }
+	if ($this->token && $this->tokenScopes == $scopes) {
+	  return $this->token;
+	}
 
-    $cacheKey = self::CACHE_PREFIX;
-    if (is_string($scopes)) {
-      $cacheKey .= $scopes;
-    } else if (is_array($scopes)) {
-      $cacheKey .= implode(":", $scopes);
-    }
+	$cacheKey = self::CACHE_PREFIX;
+	if (is_string($scopes)) {
+	  $cacheKey .= $scopes;
+	} else if (is_array($scopes)) {
+	  $cacheKey .= implode(":", $scopes);
+	}
 
-    $this->token = $this->client->getCache()->get($cacheKey);
-    if (!$this->token) {
-      $this->retrieveToken($scopes, $cacheKey);
-    } else if ($this->token['expiration_time'] < time()) {
-      $this->client->getCache()->delete($cacheKey);
-      $this->retrieveToken($scopes, $cacheKey);
-    }
+	$this->token = $this->client->getCache()->get($cacheKey);
+	if (!$this->token) {
+	  $this->retrieveToken($scopes, $cacheKey);
+	} else if ($this->token['expiration_time'] < time()) {
+	  $this->client->getCache()->delete($cacheKey);
+	  $this->retrieveToken($scopes, $cacheKey);
+	}
 
-    $this->tokenScopes = $scopes;
-    return $this->token;
+	$this->tokenScopes = $scopes;
+	return $this->token;
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   private function retrieveToken($scopes, $cacheKey)
   {
-    $this->token = AppIdentityService::getAccessToken($scopes);
-    if ($this->token) {
-      $this->client->getCache()->set(
-          $cacheKey,
-          $this->token
-      );
-    }
+	$this->token = AppIdentityService::getAccessToken($scopes);
+	if ($this->token) {
+	  $this->client->getCache()->set(
+		  $cacheKey,
+		  $this->token
+	  );
+	}
   }
 
   /**
@@ -97,24 +97,24 @@ 
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->client->getIo()->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->client->getIo()->makeRequest($request);
   }
 
   public function sign(Google_Http_Request $request)
   {
-    if (!$this->token) {
-      // No token, so nothing to do.
-      return $request;
-    }
+	if (!$this->token) {
+	  // No token, so nothing to do.
+	  return $request;
+	}
 
-    $this->client->getLogger()->debug('App Identity authentication');
+	$this->client->getLogger()->debug('App Identity authentication');
 
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
+	// Add the OAuth2 header to the request
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
 
-    return $request;
+	return $request;
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 use google\appengine\api\app_identity\AppIdentityService;
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -112,7 +112,7 @@ 
 
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
     );
 
     return $request;

geodirectory-admin/google-api-php-client/src/Google/Auth/Simple.php

Indentation +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
 
   public function __construct(Google_Client $client, $config = null)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -45,19 +45,19 @@ 
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->io->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->io->makeRequest($request);
   }
 
   public function sign(Google_Http_Request $request)
   {
-    $key = $this->client->getClassConfig($this, 'developer_key');
-    if ($key) {
-      $this->client->getLogger()->debug(
-          'Simple API Access developer key authentication'
-      );
-      $request->setQueryParam('key', $key);
-    }
-    return $request;
+	$key = $this->client->getClassConfig($this, 'developer_key');
+	if ($key) {
+	  $this->client->getLogger()->debug(
+		  'Simple API Access developer key authentication'
+	  );
+	  $request->setQueryParam('key', $key);
+	}
+	return $request;
   }
 }

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

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

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_Auth_Exception extends Google_Exception

geodirectory-admin/google-api-php-client/src/Google/Auth/ComputeEngine.php

Indentation +51 added lines, -51 removed lines

@@ -28,13 +28,13 @@ 
 class Google_Auth_ComputeEngine extends Google_Auth_Abstract
 {
   const METADATA_AUTH_URL =
-      'http://metadata/computeMetadata/v1/instance/service-accounts/default/token';
+	  'http://metadata/computeMetadata/v1/instance/service-accounts/default/token';
   private $client;
   private $token;
 
   public function __construct(Google_Client $client, $config = null)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -49,8 +49,8 @@ 
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->client->getIo()->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->client->getIo()->makeRequest($request);
   }
 
   /**
@@ -59,20 +59,20 @@ 
    */
   public function setAccessToken($token)
   {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_Auth_Exception('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_Auth_Exception("Invalid token format");
-    }
-    $token['created'] = time();
-    $this->token = $token;
+	$token = json_decode($token, true);
+	if ($token == null) {
+	  throw new Google_Auth_Exception('Could not json decode the token');
+	}
+	if (! isset($token['access_token'])) {
+	  throw new Google_Auth_Exception("Invalid token format");
+	}
+	$token['created'] = time();
+	$this->token = $token;
   }
 
   public function getAccessToken()
   {
-    return json_encode($this->token);
+	return json_encode($this->token);
   }
 
   /**
@@ -81,29 +81,29 @@ 
    */
   public function acquireAccessToken()
   {
-    $request = new Google_Http_Request(
-        self::METADATA_AUTH_URL,
-        'GET',
-        array(
-          'Metadata-Flavor' => 'Google'
-        )
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
+	$request = new Google_Http_Request(
+		self::METADATA_AUTH_URL,
+		'GET',
+		array(
+		  'Metadata-Flavor' => 'Google'
+		)
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
 
-    if ($response->getResponseHttpCode() == 200) {
-      $this->setAccessToken($response->getResponseBody());
-      $this->token['created'] = time();
-      return $this->getAccessToken();
-    } else {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Error fetching service account access token, message: '%s'",
-              $response->getResponseBody()
-          ),
-          $response->getResponseHttpCode()
-      );
-    }
+	if ($response->getResponseHttpCode() == 200) {
+	  $this->setAccessToken($response->getResponseBody());
+	  $this->token['created'] = time();
+	  return $this->getAccessToken();
+	} else {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Error fetching service account access token, message: '%s'",
+			  $response->getResponseBody()
+		  ),
+		  $response->getResponseHttpCode()
+	  );
+	}
   }
 
   /**
@@ -114,17 +114,17 @@ 
    */
   public function sign(Google_Http_Request $request)
   {
-    if ($this->isAccessTokenExpired()) {
-      $this->acquireAccessToken();
-    }
+	if ($this->isAccessTokenExpired()) {
+	  $this->acquireAccessToken();
+	}
 
-    $this->client->getLogger()->debug('Compute engine service account authentication');
+	$this->client->getLogger()->debug('Compute engine service account authentication');
 
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
 
-    return $request;
+	return $request;
   }
 
   /**
@@ -133,14 +133,14 @@ 
    */
   public function isAccessTokenExpired()
   {
-    if (!$this->token || !isset($this->token['created'])) {
-      return true;
-    }
+	if (!$this->token || !isset($this->token['created'])) {
+	  return true;
+	}
 
-    // If the token is set to expire in the next 30 seconds.
-    $expired = ($this->token['created']
-        + ($this->token['expires_in'] - 30)) < time();
+	// If the token is set to expire in the next 30 seconds.
+	$expired = ($this->token['created']
+		+ ($this->token['expires_in'] - 30)) < time();
 
-    return $expired;
+	return $expired;
   }
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -63,7 +63,7 @@ 
     if ($token == null) {
       throw new Google_Auth_Exception('Could not json decode the token');
     }
-    if (! isset($token['access_token'])) {
+    if (!isset($token['access_token'])) {
       throw new Google_Auth_Exception("Invalid token format");
     }
     $token['created'] = time();
@@ -121,7 +121,7 @@ 
     $this->client->getLogger()->debug('Compute engine service account authentication');
 
     $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
     );
 
     return $request;

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

Indentation +111 added lines, -111 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
   public static function isRequestCacheable(Google_Http_Request $resp)
   {
     $method = $resp->getRequestMethod();
-    if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
+    if (!in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
       return false;
     }
 
@@ -71,7 +71,7 @@ 
     }
 
     $code = $resp->getResponseHttpCode();
-    if (! in_array($code, self::$CACHEABLE_STATUS_CODES)) {
+    if (!in_array($code, self::$CACHEABLE_STATUS_CODES)) {
       return false;
     }
 

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

Indentation +159 added lines, -159 removed lines

@@ -73,29 +73,29 @@ 
    * only used if resumable=True
    */
   public function __construct(
-      Google_Client $client,
-      Google_Http_Request $request,
-      $mimeType,
-      $data,
-      $resumable = false,
-      $chunkSize = false,
-      $boundary = false
+	  Google_Client $client,
+	  Google_Http_Request $request,
+	  $mimeType,
+	  $data,
+	  $resumable = false,
+	  $chunkSize = false,
+	  $boundary = false
   ) {
-    $this->client = $client;
-    $this->request = $request;
-    $this->mimeType = $mimeType;
-    $this->data = $data;
-    $this->size = strlen($this->data);
-    $this->resumable = $resumable;
-    if (!$chunkSize) {
-      $chunkSize = 256 * 1024;
-    }
-    $this->chunkSize = $chunkSize;
-    $this->progress = 0;
-    $this->boundary = $boundary;
-
-    // Process Media Request
-    $this->process();
+	$this->client = $client;
+	$this->request = $request;
+	$this->mimeType = $mimeType;
+	$this->data = $data;
+	$this->size = strlen($this->data);
+	$this->resumable = $resumable;
+	if (!$chunkSize) {
+	  $chunkSize = 256 * 1024;
+	}
+	$this->chunkSize = $chunkSize;
+	$this->progress = 0;
+	$this->boundary = $boundary;
+
+	// Process Media Request
+	$this->process();
   }
 
   /**
@@ -104,7 +104,7 @@ 
    */
   public function setFileSize($size)
   {
-    $this->size = $size;
+	$this->size = $size;
   }
 
   /**
@@ -113,7 +113,7 @@ 
    */
   public function getProgress()
   {
-    return $this->progress;
+	return $this->progress;
   }
 
   /**
@@ -122,7 +122,7 @@ 
    */
   public function getHttpResultCode()
   {
-    return $this->httpResultCode;
+	return $this->httpResultCode;
   }
 
   /**
@@ -132,56 +132,56 @@ 
    */
   public function nextChunk($chunk = false)
   {
-    if (false == $this->resumeUri) {
-      $this->resumeUri = $this->getResumeUri();
-    }
-
-    if (false == $chunk) {
-      $chunk = substr($this->data, $this->progress, $this->chunkSize);
-    }
-
-    $lastBytePos = $this->progress + strlen($chunk) - 1;
-    $headers = array(
-      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
-      'content-type' => $this->request->getRequestHeader('content-type'),
-      'content-length' => $this->chunkSize,
-      'expect' => '',
-    );
-
-    $httpRequest = new Google_Http_Request(
-        $this->resumeUri,
-        'PUT',
-        $headers,
-        $chunk
-    );
-
-    if ($this->client->getClassConfig("Google_Http_Request", "enable_gzip_for_uploads")) {
-      $httpRequest->enableGzip();
-    } else {
-      $httpRequest->disableGzip();
-    }
-
-    $response = $this->client->getIo()->makeRequest($httpRequest);
-    $response->setExpectedClass($this->request->getExpectedClass());
-    $code = $response->getResponseHttpCode();
-    $this->httpResultCode = $code;
-
-    if (308 == $code) {
-      // Track the amount uploaded.
-      $range = explode('-', $response->getResponseHeader('range'));
-      $this->progress = $range[1] + 1;
-
-      // Allow for changing upload URLs.
-      $location = $response->getResponseHeader('location');
-      if ($location) {
-        $this->resumeUri = $location;
-      }
-
-      // No problems, but upload not complete.
-      return false;
-    } else {
-      return Google_Http_REST::decodeHttpResponse($response, $this->client);
-    }
+	if (false == $this->resumeUri) {
+	  $this->resumeUri = $this->getResumeUri();
+	}
+
+	if (false == $chunk) {
+	  $chunk = substr($this->data, $this->progress, $this->chunkSize);
+	}
+
+	$lastBytePos = $this->progress + strlen($chunk) - 1;
+	$headers = array(
+	  'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
+	  'content-type' => $this->request->getRequestHeader('content-type'),
+	  'content-length' => $this->chunkSize,
+	  'expect' => '',
+	);
+
+	$httpRequest = new Google_Http_Request(
+		$this->resumeUri,
+		'PUT',
+		$headers,
+		$chunk
+	);
+
+	if ($this->client->getClassConfig("Google_Http_Request", "enable_gzip_for_uploads")) {
+	  $httpRequest->enableGzip();
+	} else {
+	  $httpRequest->disableGzip();
+	}
+
+	$response = $this->client->getIo()->makeRequest($httpRequest);
+	$response->setExpectedClass($this->request->getExpectedClass());
+	$code = $response->getResponseHttpCode();
+	$this->httpResultCode = $code;
+
+	if (308 == $code) {
+	  // Track the amount uploaded.
+	  $range = explode('-', $response->getResponseHeader('range'));
+	  $this->progress = $range[1] + 1;
+
+	  // Allow for changing upload URLs.
+	  $location = $response->getResponseHeader('location');
+	  if ($location) {
+		$this->resumeUri = $location;
+	  }
+
+	  // No problems, but upload not complete.
+	  return false;
+	} else {
+	  return Google_Http_REST::decodeHttpResponse($response, $this->client);
+	}
   }
 
   /**
@@ -192,53 +192,53 @@ 
    */
   private function process()
   {
-    $postBody = false;
-    $contentType = false;
-
-    $meta = $this->request->getPostBody();
-    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
-
-    $uploadType = $this->getUploadType($meta);
-    $this->request->setQueryParam('uploadType', $uploadType);
-    $this->transformToUploadUrl();
-    $mimeType = $this->mimeType ?
-        $this->mimeType :
-        $this->request->getRequestHeader('content-type');
-
-    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
-      $contentType = $mimeType;
-      $postBody = is_string($meta) ? $meta : json_encode($meta);
-    } else if (self::UPLOAD_MEDIA_TYPE == $uploadType) {
-      $contentType = $mimeType;
-      $postBody = $this->data;
-    } else if (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
-      // This is a multipart/related upload.
-      $boundary = $this->boundary ? $this->boundary : mt_rand();
-      $boundary = str_replace('"', '', $boundary);
-      $contentType = 'multipart/related; boundary=' . $boundary;
-      $related = "--$boundary\r\n";
-      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
-      $related .= "--$boundary\r\n";
-      $related .= "Content-Type: $mimeType\r\n";
-      $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($this->data) . "\r\n";
-      $related .= "--$boundary--";
-      $postBody = $related;
-    }
-
-    $this->request->setPostBody($postBody);
-
-    if (isset($contentType) && $contentType) {
-      $contentTypeHeader['content-type'] = $contentType;
-      $this->request->setRequestHeaders($contentTypeHeader);
-    }
+	$postBody = false;
+	$contentType = false;
+
+	$meta = $this->request->getPostBody();
+	$meta = is_string($meta) ? json_decode($meta, true) : $meta;
+
+	$uploadType = $this->getUploadType($meta);
+	$this->request->setQueryParam('uploadType', $uploadType);
+	$this->transformToUploadUrl();
+	$mimeType = $this->mimeType ?
+		$this->mimeType :
+		$this->request->getRequestHeader('content-type');
+
+	if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
+	  $contentType = $mimeType;
+	  $postBody = is_string($meta) ? $meta : json_encode($meta);
+	} else if (self::UPLOAD_MEDIA_TYPE == $uploadType) {
+	  $contentType = $mimeType;
+	  $postBody = $this->data;
+	} else if (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+	  // This is a multipart/related upload.
+	  $boundary = $this->boundary ? $this->boundary : mt_rand();
+	  $boundary = str_replace('"', '', $boundary);
+	  $contentType = 'multipart/related; boundary=' . $boundary;
+	  $related = "--$boundary\r\n";
+	  $related .= "Content-Type: application/json; charset=UTF-8\r\n";
+	  $related .= "\r\n" . json_encode($meta) . "\r\n";
+	  $related .= "--$boundary\r\n";
+	  $related .= "Content-Type: $mimeType\r\n";
+	  $related .= "Content-Transfer-Encoding: base64\r\n";
+	  $related .= "\r\n" . base64_encode($this->data) . "\r\n";
+	  $related .= "--$boundary--";
+	  $postBody = $related;
+	}
+
+	$this->request->setPostBody($postBody);
+
+	if (isset($contentType) && $contentType) {
+	  $contentTypeHeader['content-type'] = $contentType;
+	  $this->request->setRequestHeaders($contentTypeHeader);
+	}
   }
 
   private function transformToUploadUrl()
   {
-    $base = $this->request->getBaseComponent();
-    $this->request->setBaseComponent($base . '/upload');
+	$base = $this->request->getBaseComponent();
+	$this->request->setBaseComponent($base . '/upload');
   }
 
   /**
@@ -252,56 +252,56 @@ 
    */
   public function getUploadType($meta)
   {
-    if ($this->resumable) {
-      return self::UPLOAD_RESUMABLE_TYPE;
-    }
+	if ($this->resumable) {
+	  return self::UPLOAD_RESUMABLE_TYPE;
+	}
 
-    if (false == $meta && $this->data) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
+	if (false == $meta && $this->data) {
+	  return self::UPLOAD_MEDIA_TYPE;
+	}
 
-    return self::UPLOAD_MULTIPART_TYPE;
+	return self::UPLOAD_MULTIPART_TYPE;
   }
 
   private function getResumeUri()
   {
-    $result = null;
-    $body = $this->request->getPostBody();
-    if ($body) {
-      $headers = array(
-        'content-type' => 'application/json; charset=UTF-8',
-        'content-length' => Google_Utils::getStrLen($body),
-        'x-upload-content-type' => $this->mimeType,
-        'x-upload-content-length' => $this->size,
-        'expect' => '',
-      );
-      $this->request->setRequestHeaders($headers);
-    }
-
-    $response = $this->client->getIo()->makeRequest($this->request);
-    $location = $response->getResponseHeader('location');
-    $code = $response->getResponseHttpCode();
-
-    if (200 == $code && true == $location) {
-      return $location;
-    }
-    $message = $code;
-    $body = @json_decode($response->getResponseBody());
-    if (!empty($body->error->errors) ) {
-      $message .= ': ';
-      foreach ($body->error->errors as $error) {
-        $message .= "{$error->domain}, {$error->message};";
-      }
-      $message = rtrim($message, ';');
-    }
-
-    $error = "Failed to start the resumable upload (HTTP {$message})";
-    $this->client->getLogger()->error($error);
-    throw new Google_Exception($error);
+	$result = null;
+	$body = $this->request->getPostBody();
+	if ($body) {
+	  $headers = array(
+		'content-type' => 'application/json; charset=UTF-8',
+		'content-length' => Google_Utils::getStrLen($body),
+		'x-upload-content-type' => $this->mimeType,
+		'x-upload-content-length' => $this->size,
+		'expect' => '',
+	  );
+	  $this->request->setRequestHeaders($headers);
+	}
+
+	$response = $this->client->getIo()->makeRequest($this->request);
+	$location = $response->getResponseHeader('location');
+	$code = $response->getResponseHttpCode();
+
+	if (200 == $code && true == $location) {
+	  return $location;
+	}
+	$message = $code;
+	$body = @json_decode($response->getResponseBody());
+	if (!empty($body->error->errors) ) {
+	  $message .= ': ';
+	  foreach ($body->error->errors as $error) {
+		$message .= "{$error->domain}, {$error->message};";
+	  }
+	  $message = rtrim($message, ';');
+	}
+
+	$error = "Failed to start the resumable upload (HTTP {$message})";
+	$this->client->getLogger()->error($error);
+	throw new Google_Exception($error);
   }
 
   public function setChunkSize($chunkSize)
   {
-    $this->chunkSize = $chunkSize;
+	$this->chunkSize = $chunkSize;
   }
 }

Spacing +7 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -202,8 +202,7 @@ 
     $this->request->setQueryParam('uploadType', $uploadType);
     $this->transformToUploadUrl();
     $mimeType = $this->mimeType ?
-        $this->mimeType :
-        $this->request->getRequestHeader('content-type');
+        $this->mimeType : $this->request->getRequestHeader('content-type');
 
     if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
       $contentType = $mimeType;
@@ -215,14 +214,14 @@ 
       // This is a multipart/related upload.
       $boundary = $this->boundary ? $this->boundary : mt_rand();
       $boundary = str_replace('"', '', $boundary);
-      $contentType = 'multipart/related; boundary=' . $boundary;
+      $contentType = 'multipart/related; boundary='.$boundary;
       $related = "--$boundary\r\n";
       $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
+      $related .= "\r\n".json_encode($meta)."\r\n";
       $related .= "--$boundary\r\n";
       $related .= "Content-Type: $mimeType\r\n";
       $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($this->data) . "\r\n";
+      $related .= "\r\n".base64_encode($this->data)."\r\n";
       $related .= "--$boundary--";
       $postBody = $related;
     }
@@ -238,7 +237,7 @@ 
   private function transformToUploadUrl()
   {
     $base = $this->request->getBaseComponent();
-    $this->request->setBaseComponent($base . '/upload');
+    $this->request->setBaseComponent($base.'/upload');
   }
 
   /**
@@ -287,7 +286,7 @@ 
     }
     $message = $code;
     $body = @json_decode($response->getResponseBody());
-    if (!empty($body->error->errors) ) {
+    if (!empty($body->error->errors)) {
       $message .= ': ';
       foreach ($body->error->errors as $error) {
         $message .= "{$error->domain}, {$error->message};";

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;