GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/cache/Google_ApcCache.php

Indentation +38 added lines, -38 removed lines

@@ -26,66 +26,66 @@ 
 class Google_APCCache extends Google_Cache {
 
   public function __construct() {
-    if (! function_exists('apc_add')) {
-      throw new Google_CacheException("Apc functions not available");
-    }
+	if (! function_exists('apc_add')) {
+	  throw new Google_CacheException("Apc functions not available");
+	}
   }
 
   private function isLocked($key) {
-    if ((@apc_fetch($key . '.lock')) === false) {
-      return false;
-    }
-    return true;
+	if ((@apc_fetch($key . '.lock')) === false) {
+	  return false;
+	}
+	return true;
   }
 
   private function createLock($key) {
-    // the interesting thing is that this could fail if the lock was created in the meantime..
-    // but we'll ignore that out of convenience
-    @apc_add($key . '.lock', '', 5);
+	// the interesting thing is that this could fail if the lock was created in the meantime..
+	// but we'll ignore that out of convenience
+	@apc_add($key . '.lock', '', 5);
   }
 
   private function removeLock($key) {
-    // suppress all warnings, if some other process removed it that's ok too
-    @apc_delete($key . '.lock');
+	// suppress all warnings, if some other process removed it that's ok too
+	@apc_delete($key . '.lock');
   }
 
   private function waitForLock($key) {
-    // 20 x 250 = 5 seconds
-    $tries = 20;
-    $cnt = 0;
-    do {
-      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
-      usleep(250);
-      $cnt ++;
-    } while ($cnt <= $tries && $this->isLocked($key));
-    if ($this->isLocked($key)) {
-      // 5 seconds passed, assume the owning process died off and remove it
-      $this->removeLock($key);
-    }
+	// 20 x 250 = 5 seconds
+	$tries = 20;
+	$cnt = 0;
+	do {
+	  // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
+	  usleep(250);
+	  $cnt ++;
+	} while ($cnt <= $tries && $this->isLocked($key));
+	if ($this->isLocked($key)) {
+	  // 5 seconds passed, assume the owning process died off and remove it
+	  $this->removeLock($key);
+	}
   }
 
    /**
-   * @inheritDoc
-   */
+    * @inheritDoc
+    */
   public function get($key, $expiration = false) {
 
-    if (($ret = @apc_fetch($key)) === false) {
-      return false;
-    }
-    if (!$expiration || (time() - $ret['time'] > $expiration)) {
-      $this->delete($key);
-      return false;
-    }
-    return unserialize($ret['data']);
+	if (($ret = @apc_fetch($key)) === false) {
+	  return false;
+	}
+	if (!$expiration || (time() - $ret['time'] > $expiration)) {
+	  $this->delete($key);
+	  return false;
+	}
+	return unserialize($ret['data']);
   }
 
   /**
    * @inheritDoc
    */
   public function set($key, $value) {
-    if (@apc_store($key, array('time' => time(), 'data' => serialize($value))) == false) {
-      throw new Google_CacheException("Couldn't store data");
-    }
+	if (@apc_store($key, array('time' => time(), 'data' => serialize($value))) == false) {
+	  throw new Google_CacheException("Couldn't store data");
+	}
   }
 
   /**
@@ -93,6 +93,6 @@ 
    * @param String $key
    */
   public function delete($key) {
-    @apc_delete($key);
+	@apc_delete($key);
   }
 }

Spacing +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@ 
 class Google_APCCache extends Google_Cache {
 
   public function __construct() {
-    if (! function_exists('apc_add')) {
+    if (!function_exists('apc_add')) {
       throw new Google_CacheException("Apc functions not available");
     }
   }
 
   private function isLocked($key) {
-    if ((@apc_fetch($key . '.lock')) === false) {
+    if ((@apc_fetch($key.'.lock')) === false) {
       return false;
     }
     return true;
@@ -41,12 +41,12 @@ 
   private function createLock($key) {
     // the interesting thing is that this could fail if the lock was created in the meantime..
     // but we'll ignore that out of convenience
-    @apc_add($key . '.lock', '', 5);
+    @apc_add($key.'.lock', '', 5);
   }
 
   private function removeLock($key) {
     // suppress all warnings, if some other process removed it that's ok too
-    @apc_delete($key . '.lock');
+    @apc_delete($key.'.lock');
   }
 
   private function waitForLock($key) {
@@ -56,7 +56,7 @@ 
     do {
       // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
       usleep(250);
-      $cnt ++;
+      $cnt++;
     } while ($cnt <= $tries && $this->isLocked($key));
     if ($this->isLocked($key)) {
       // 5 seconds passed, assume the owning process died off and remove it

geodirectory-admin/google-api-php-client/src/config.php

Indentation +53 added lines, -53 removed lines

@@ -17,65 +17,65 @@
 
 global $apiConfig;
 $apiConfig = array(
-    // True if objects should be returned by the service classes.
-    // False if associative arrays should be returned (default behavior).
-    'use_objects' => false,
+	// True if objects should be returned by the service classes.
+	// False if associative arrays should be returned (default behavior).
+	'use_objects' => false,
   
-    // The application_name is included in the User-Agent HTTP header.
-    'application_name' => '',
+	// The application_name is included in the User-Agent HTTP header.
+	'application_name' => '',
 
-    // OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
-    'oauth2_client_id' => '',
-    'oauth2_client_secret' => '',
-    'oauth2_redirect_uri' => '',
+	// OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
+	'oauth2_client_id' => '',
+	'oauth2_client_secret' => '',
+	'oauth2_redirect_uri' => '',
 
-    // The developer key, you get this at https://code.google.com/apis/console
-    'developer_key' => '',
+	// The developer key, you get this at https://code.google.com/apis/console
+	'developer_key' => '',
   
-    // Site name to show in the Google's OAuth 1 authentication screen.
-    'site_name' => 'www.example.org',
+	// Site name to show in the Google's OAuth 1 authentication screen.
+	'site_name' => 'www.example.org',
 
-    // Which Authentication, Storage and HTTP IO classes to use.
-    'authClass'    => 'Google_OAuth2',
-    'ioClass'      => 'Google_CurlIO',
-    'cacheClass'   => 'Google_FileCache',
+	// Which Authentication, Storage and HTTP IO classes to use.
+	'authClass'    => 'Google_OAuth2',
+	'ioClass'      => 'Google_CurlIO',
+	'cacheClass'   => 'Google_FileCache',
 
-    // Don't change these unless you're working against a special development or testing environment.
-    'basePath' => 'https://www.googleapis.com',
+	// Don't change these unless you're working against a special development or testing environment.
+	'basePath' => 'https://www.googleapis.com',
 
-    // IO Class dependent configuration, you only have to configure the values
-    // for the class that was configured as the ioClass above
-    'ioFileCache_directory'  =>
-        (function_exists('sys_get_temp_dir') ?
-            sys_get_temp_dir() . '/Google_Client' :
-        '/tmp/Google_Client'),
+	// IO Class dependent configuration, you only have to configure the values
+	// for the class that was configured as the ioClass above
+	'ioFileCache_directory'  =>
+		(function_exists('sys_get_temp_dir') ?
+			sys_get_temp_dir() . '/Google_Client' :
+		'/tmp/Google_Client'),
 
-    // Definition of service specific values like scopes, oauth token URLs, etc
-    'services' => array(
-      'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
-      'calendar' => array(
-          'scope' => array(
-              "https://www.googleapis.com/auth/calendar",
-              "https://www.googleapis.com/auth/calendar.readonly",
-          )
-      ),
-      'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
-      'latitude' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/latitude.all.best',
-              'https://www.googleapis.com/auth/latitude.all.city',
-          )
-      ),
-      'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
-      'oauth2' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/userinfo.profile',
-              'https://www.googleapis.com/auth/userinfo.email',
-          )
-      ),
-      'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.login'),
-      'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
-      'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
-      'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
-    )
+	// Definition of service specific values like scopes, oauth token URLs, etc
+	'services' => array(
+	  'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
+	  'calendar' => array(
+		  'scope' => array(
+			  "https://www.googleapis.com/auth/calendar",
+			  "https://www.googleapis.com/auth/calendar.readonly",
+		  )
+	  ),
+	  'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
+	  'latitude' => array(
+		  'scope' => array(
+			  'https://www.googleapis.com/auth/latitude.all.best',
+			  'https://www.googleapis.com/auth/latitude.all.city',
+		  )
+	  ),
+	  'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
+	  'oauth2' => array(
+		  'scope' => array(
+			  'https://www.googleapis.com/auth/userinfo.profile',
+			  'https://www.googleapis.com/auth/userinfo.email',
+		  )
+	  ),
+	  'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.login'),
+	  'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
+	  'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
+	  'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
+	)
 );

Spacing +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
     // for the class that was configured as the ioClass above
     'ioFileCache_directory'  =>
         (function_exists('sys_get_temp_dir') ?
-            sys_get_temp_dir() . '/Google_Client' :
-        '/tmp/Google_Client'),
+            sys_get_temp_dir().'/Google_Client' : '/tmp/Google_Client'),
 
     // Definition of service specific values like scopes, oauth token URLs, etc
     'services' => array(

geodirectory-admin/google-api-php-client/src/local_config.php

Indentation +53 added lines, -53 removed lines

@@ -17,65 +17,65 @@
 
 global $apiConfig;
 $apiConfig = array(
-    // True if objects should be returned by the service classes.
-    // False if associative arrays should be returned (default behavior).
-    'use_objects' => false,
+	// True if objects should be returned by the service classes.
+	// False if associative arrays should be returned (default behavior).
+	'use_objects' => false,
   
-    // The application_name is included in the User-Agent HTTP header.
-    'application_name' => '',
+	// The application_name is included in the User-Agent HTTP header.
+	'application_name' => '',
 
-    // OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
-    //'oauth2_client_id' => '',
-    //'oauth2_client_secret' => '',
-    //'oauth2_redirect_uri' => '',
+	// OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
+	//'oauth2_client_id' => '',
+	//'oauth2_client_secret' => '',
+	//'oauth2_redirect_uri' => '',
 
-    // The developer key, you get this at https://code.google.com/apis/console
-    'developer_key' => '',
+	// The developer key, you get this at https://code.google.com/apis/console
+	'developer_key' => '',
   
-    // Site name to show in the Google's OAuth 1 authentication screen.
-    'site_name' => 'www.example.org',
+	// Site name to show in the Google's OAuth 1 authentication screen.
+	'site_name' => 'www.example.org',
 
-    // Which Authentication, Storage and HTTP IO classes to use.
-    'authClass'    => 'Google_OAuth2',
-    'ioClass'      => 'Google_CurlIO',
-    'cacheClass'   => 'Google_FileCache',
+	// Which Authentication, Storage and HTTP IO classes to use.
+	'authClass'    => 'Google_OAuth2',
+	'ioClass'      => 'Google_CurlIO',
+	'cacheClass'   => 'Google_FileCache',
 
-    // Don't change these unless you're working against a special development or testing environment.
-    'basePath' => 'https://www.googleapis.com',
+	// Don't change these unless you're working against a special development or testing environment.
+	'basePath' => 'https://www.googleapis.com',
 
-    // IO Class dependent configuration, you only have to configure the values
-    // for the class that was configured as the ioClass above
-    'ioFileCache_directory'  =>
-        (function_exists('get_temp_dir') ?
-            get_temp_dir()  . '/Google_Client' :
-        '/tmp/Google_Client'),
+	// IO Class dependent configuration, you only have to configure the values
+	// for the class that was configured as the ioClass above
+	'ioFileCache_directory'  =>
+		(function_exists('get_temp_dir') ?
+			get_temp_dir()  . '/Google_Client' :
+		'/tmp/Google_Client'),
 
-    // Definition of service specific values like scopes, oauth token URLs, etc
-    'services' => array(
-      'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
-      'calendar' => array(
-          'scope' => array(
-              "https://www.googleapis.com/auth/calendar",
-              "https://www.googleapis.com/auth/calendar.readonly",
-          )
-      ),
-      'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
-      'latitude' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/latitude.all.best',
-              'https://www.googleapis.com/auth/latitude.all.city',
-          )
-      ),
-      'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
-      'oauth2' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/userinfo.profile',
-              'https://www.googleapis.com/auth/userinfo.email',
-          )
-      ),
-      'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.me'),
-      'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
-      'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
-      'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
-    )
+	// Definition of service specific values like scopes, oauth token URLs, etc
+	'services' => array(
+	  'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
+	  'calendar' => array(
+		  'scope' => array(
+			  "https://www.googleapis.com/auth/calendar",
+			  "https://www.googleapis.com/auth/calendar.readonly",
+		  )
+	  ),
+	  'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
+	  'latitude' => array(
+		  'scope' => array(
+			  'https://www.googleapis.com/auth/latitude.all.best',
+			  'https://www.googleapis.com/auth/latitude.all.city',
+		  )
+	  ),
+	  'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
+	  'oauth2' => array(
+		  'scope' => array(
+			  'https://www.googleapis.com/auth/userinfo.profile',
+			  'https://www.googleapis.com/auth/userinfo.email',
+		  )
+	  ),
+	  'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.me'),
+	  'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
+	  'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
+	  'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
+	)
 );
\ No newline at end of file

Spacing +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
     // for the class that was configured as the ioClass above
     'ioFileCache_directory'  =>
         (function_exists('get_temp_dir') ?
-            get_temp_dir()  . '/Google_Client' :
-        '/tmp/Google_Client'),
+            get_temp_dir().'/Google_Client' : '/tmp/Google_Client'),
 
     // Definition of service specific values like scopes, oauth token URLs, etc
     'services' => array(

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

Indentation +281 added lines, -281 removed lines

@@ -53,31 +53,31 @@ 
    * to the discretion of the caller (which is done by calling authenticate()).
    */
   public function __construct() {
-    global $apiConfig;
+	global $apiConfig;
 
-    if (! empty($apiConfig['developer_key'])) {
-      $this->developerKey = $apiConfig['developer_key'];
-    }
+	if (! empty($apiConfig['developer_key'])) {
+	  $this->developerKey = $apiConfig['developer_key'];
+	}
 
-    if (! empty($apiConfig['oauth2_client_id'])) {
-      $this->clientId = $apiConfig['oauth2_client_id'];
-    }
+	if (! empty($apiConfig['oauth2_client_id'])) {
+	  $this->clientId = $apiConfig['oauth2_client_id'];
+	}
 
-    if (! empty($apiConfig['oauth2_client_secret'])) {
-      $this->clientSecret = $apiConfig['oauth2_client_secret'];
-    }
+	if (! empty($apiConfig['oauth2_client_secret'])) {
+	  $this->clientSecret = $apiConfig['oauth2_client_secret'];
+	}
 
-    if (! empty($apiConfig['oauth2_redirect_uri'])) {
-      $this->redirectUri = $apiConfig['oauth2_redirect_uri'];
-    }
+	if (! empty($apiConfig['oauth2_redirect_uri'])) {
+	  $this->redirectUri = $apiConfig['oauth2_redirect_uri'];
+	}
 
-    if (! empty($apiConfig['oauth2_access_type'])) {
-      $this->accessType = $apiConfig['oauth2_access_type'];
-    }
+	if (! empty($apiConfig['oauth2_access_type'])) {
+	  $this->accessType = $apiConfig['oauth2_access_type'];
+	}
 
-    if (! empty($apiConfig['oauth2_approval_prompt'])) {
-      $this->approvalPrompt = $apiConfig['oauth2_approval_prompt'];
-    }
+	if (! empty($apiConfig['oauth2_approval_prompt'])) {
+	  $this->approvalPrompt = $apiConfig['oauth2_approval_prompt'];
+	}
 
   }
 
@@ -88,37 +88,37 @@ 
    * @return string
    */
   public function authenticate($service, $code = null) {
-    if (!$code && isset($_GET['code'])) {
-      $code = $_GET['code'];
-    }
-
-    if ($code) {
-      // We got here from the redirect from a successful authorization grant, fetch the access token
-      $request = Google_Client::$io->makeRequest(new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'redirect_uri' => $this->redirectUri,
-          'client_id' => $this->clientId,
-          'client_secret' => $this->clientSecret
-      )));
-
-      if ($request->getResponseHttpCode() == 200) {
-        $this->setAccessToken($request->getResponseBody());
-        $this->token['created'] = time();
-        return $this->getAccessToken();
-      } else {
-        $response = $request->getResponseBody();
-        $decodedResponse = json_decode($response, true);
-        if ($decodedResponse != null && $decodedResponse['error']) {
-          $response = $decodedResponse['error'];
-        }
-        throw new Google_AuthException("Error fetching OAuth2 access token, message: '$response'", $request->getResponseHttpCode());
-      }
-    }
-
-    $authUrl = $this->createAuthUrl($service['scope']);
-    header('Location: ' . $authUrl);
-    return true;
+	if (!$code && isset($_GET['code'])) {
+	  $code = $_GET['code'];
+	}
+
+	if ($code) {
+	  // We got here from the redirect from a successful authorization grant, fetch the access token
+	  $request = Google_Client::$io->makeRequest(new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), array(
+		  'code' => $code,
+		  'grant_type' => 'authorization_code',
+		  'redirect_uri' => $this->redirectUri,
+		  'client_id' => $this->clientId,
+		  'client_secret' => $this->clientSecret
+	  )));
+
+	  if ($request->getResponseHttpCode() == 200) {
+		$this->setAccessToken($request->getResponseBody());
+		$this->token['created'] = time();
+		return $this->getAccessToken();
+	  } else {
+		$response = $request->getResponseBody();
+		$decodedResponse = json_decode($response, true);
+		if ($decodedResponse != null && $decodedResponse['error']) {
+		  $response = $decodedResponse['error'];
+		}
+		throw new Google_AuthException("Error fetching OAuth2 access token, message: '$response'", $request->getResponseHttpCode());
+	  }
+	}
+
+	$authUrl = $this->createAuthUrl($service['scope']);
+	header('Location: ' . $authUrl);
+	return true;
   }
 
   /**
@@ -129,27 +129,27 @@ 
    * @return string
    */
   public function createAuthUrl($scope) {
-    $params = array(
-        'response_type=code',
-        'redirect_uri=' . urlencode($this->redirectUri),
-        'client_id=' . urlencode($this->clientId),
-        'scope=' . urlencode($scope),
-        'access_type=' . urlencode($this->accessType),
-        'approval_prompt=' . urlencode($this->approvalPrompt),
-    );
-
-    // if the list of scopes contains plus.login, add request_visible_actions
-    // to auth URL
-    if(strpos($scope, 'plus.login') && count($this->requestVisibleActions) > 0) {
-        $params[] = 'request_visible_actions=' .
-            urlencode($this->requestVisibleActions);
-    }
-
-    if (isset($this->state)) {
-      $params[] = 'state=' . urlencode($this->state);
-    }
-    $params = implode('&', $params);
-    return self::OAUTH2_AUTH_URL . "?$params";
+	$params = array(
+		'response_type=code',
+		'redirect_uri=' . urlencode($this->redirectUri),
+		'client_id=' . urlencode($this->clientId),
+		'scope=' . urlencode($scope),
+		'access_type=' . urlencode($this->accessType),
+		'approval_prompt=' . urlencode($this->approvalPrompt),
+	);
+
+	// if the list of scopes contains plus.login, add request_visible_actions
+	// to auth URL
+	if(strpos($scope, 'plus.login') && count($this->requestVisibleActions) > 0) {
+		$params[] = 'request_visible_actions=' .
+			urlencode($this->requestVisibleActions);
+	}
+
+	if (isset($this->state)) {
+	  $params[] = 'state=' . urlencode($this->state);
+	}
+	$params = implode('&', $params);
+	return self::OAUTH2_AUTH_URL . "?$params";
   }
 
   /**
@@ -157,38 +157,38 @@ 
    * @throws Google_AuthException
    */
   public function setAccessToken($token) {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_AuthException('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_AuthException("Invalid token format");
-    }
-    $this->token = $token;
+	$token = json_decode($token, true);
+	if ($token == null) {
+	  throw new Google_AuthException('Could not json decode the token');
+	}
+	if (! isset($token['access_token'])) {
+	  throw new Google_AuthException("Invalid token format");
+	}
+	$this->token = $token;
   }
 
   public function getAccessToken() {
-    return json_encode($this->token);
+	return json_encode($this->token);
   }
 
   public function setDeveloperKey($developerKey) {
-    $this->developerKey = $developerKey;
+	$this->developerKey = $developerKey;
   }
 
   public function setState($state) {
-    $this->state = $state;
+	$this->state = $state;
   }
 
   public function setAccessType($accessType) {
-    $this->accessType = $accessType;
+	$this->accessType = $accessType;
   }
 
   public function setApprovalPrompt($approvalPrompt) {
-    $this->approvalPrompt = $approvalPrompt;
+	$this->approvalPrompt = $approvalPrompt;
   }
 
   public function setAssertionCredentials(Google_AssertionCredentials $creds) {
-    $this->assertionCredentials = $creds;
+	$this->assertionCredentials = $creds;
   }
 
   /**
@@ -198,40 +198,40 @@ 
    * @throws Google_AuthException
    */
   public function sign(Google_HttpRequest $request) {
-    // add the developer key to the request before signing it
-    if ($this->developerKey) {
-      $requestUrl = $request->getUrl();
-      $requestUrl .= (strpos($request->getUrl(), '?') === false) ? '?' : '&';
-      $requestUrl .=  'key=' . urlencode($this->developerKey);
-      $request->setUrl($requestUrl);
-    }
-
-    // Cannot sign the request without an OAuth access token.
-    if (null == $this->token && null == $this->assertionCredentials) {
-      return $request;
-    }
-
-    // Check if the token is set to expire in the next 30 seconds
-    // (or has already expired).
-    if ($this->isAccessTokenExpired()) {
-      if ($this->assertionCredentials) {
-        $this->refreshTokenWithAssertion();
-      } else {
-        if (! array_key_exists('refresh_token', $this->token)) {
-            throw new Google_AuthException("The OAuth 2.0 access token has expired, "
-                . "and a refresh token is not available. Refresh tokens are not "
-                . "returned for responses that were auto-approved.");
-        }
-        $this->refreshToken($this->token['refresh_token']);
-      }
-    }
-
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
-
-    return $request;
+	// add the developer key to the request before signing it
+	if ($this->developerKey) {
+	  $requestUrl = $request->getUrl();
+	  $requestUrl .= (strpos($request->getUrl(), '?') === false) ? '?' : '&';
+	  $requestUrl .=  'key=' . urlencode($this->developerKey);
+	  $request->setUrl($requestUrl);
+	}
+
+	// Cannot sign the request without an OAuth access token.
+	if (null == $this->token && null == $this->assertionCredentials) {
+	  return $request;
+	}
+
+	// Check if the token is set to expire in the next 30 seconds
+	// (or has already expired).
+	if ($this->isAccessTokenExpired()) {
+	  if ($this->assertionCredentials) {
+		$this->refreshTokenWithAssertion();
+	  } else {
+		if (! array_key_exists('refresh_token', $this->token)) {
+			throw new Google_AuthException("The OAuth 2.0 access token has expired, "
+				. "and a refresh token is not available. Refresh tokens are not "
+				. "returned for responses that were auto-approved.");
+		}
+		$this->refreshToken($this->token['refresh_token']);
+	  }
+	}
+
+	// Add the OAuth2 header to the request
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
+
+	return $request;
   }
 
   /**
@@ -240,12 +240,12 @@ 
    * @return void
    */
   public function refreshToken($refreshToken) {
-    $this->refreshTokenRequest(array(
-        'client_id' => $this->clientId,
-        'client_secret' => $this->clientSecret,
-        'refresh_token' => $refreshToken,
-        'grant_type' => 'refresh_token'
-    ));
+	$this->refreshTokenRequest(array(
+		'client_id' => $this->clientId,
+		'client_secret' => $this->clientSecret,
+		'refresh_token' => $refreshToken,
+		'grant_type' => 'refresh_token'
+	));
   }
 
   /**
@@ -254,61 +254,61 @@ 
    * @return void
    */
   public function refreshTokenWithAssertion($assertionCredentials = null) {
-    if (!$assertionCredentials) {
-      $assertionCredentials = $this->assertionCredentials;
-    }
-
-    $this->refreshTokenRequest(array(
-        'grant_type' => 'assertion',
-        'assertion_type' => $assertionCredentials->assertionType,
-        'assertion' => $assertionCredentials->generateAssertion(),
-    ));
+	if (!$assertionCredentials) {
+	  $assertionCredentials = $this->assertionCredentials;
+	}
+
+	$this->refreshTokenRequest(array(
+		'grant_type' => 'assertion',
+		'assertion_type' => $assertionCredentials->assertionType,
+		'assertion' => $assertionCredentials->generateAssertion(),
+	));
   }
 
   private function refreshTokenRequest($params) {
-    $http = new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), $params);
-    $request = Google_Client::$io->makeRequest($http);
-
-    $code = $request->getResponseHttpCode();
-    $body = $request->getResponseBody();
-    if (200 == $code) {
-      $token = json_decode($body, true);
-      if ($token == null) {
-        throw new Google_AuthException("Could not json decode the access token");
-      }
-
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
-        throw new Google_AuthException("Invalid token format");
-      }
-
-      $this->token['access_token'] = $token['access_token'];
-      $this->token['expires_in'] = $token['expires_in'];
-      $this->token['created'] = time();
-    } else {
-      throw new Google_AuthException("Error refreshing the OAuth2 token, message: '$body'", $code);
-    }
+	$http = new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), $params);
+	$request = Google_Client::$io->makeRequest($http);
+
+	$code = $request->getResponseHttpCode();
+	$body = $request->getResponseBody();
+	if (200 == $code) {
+	  $token = json_decode($body, true);
+	  if ($token == null) {
+		throw new Google_AuthException("Could not json decode the access token");
+	  }
+
+	  if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+		throw new Google_AuthException("Invalid token format");
+	  }
+
+	  $this->token['access_token'] = $token['access_token'];
+	  $this->token['expires_in'] = $token['expires_in'];
+	  $this->token['created'] = time();
+	} else {
+	  throw new Google_AuthException("Error refreshing the OAuth2 token, message: '$body'", $code);
+	}
   }
 
-    /**
-     * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-     * token, if a token isn't provided.
-     * @throws Google_AuthException
-     * @param string|null $token The token (access token or a refresh token) that should be revoked.
-     * @return boolean Returns True if the revocation was successful, otherwise False.
-     */
+	/**
+	 * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+	 * token, if a token isn't provided.
+	 * @throws Google_AuthException
+	 * @param string|null $token The token (access token or a refresh token) that should be revoked.
+	 * @return boolean Returns True if the revocation was successful, otherwise False.
+	 */
   public function revokeToken($token = null) {
-    if (!$token) {
-      $token = $this->token['access_token'];
-    }
-    $request = new Google_HttpRequest(self::OAUTH2_REVOKE_URI, 'POST', array(), "token=$token");
-    $response = Google_Client::$io->makeRequest($request);
-    $code = $response->getResponseHttpCode();
-    if ($code == 200) {
-      $this->token = null;
-      return true;
-    }
-
-    return false;
+	if (!$token) {
+	  $token = $this->token['access_token'];
+	}
+	$request = new Google_HttpRequest(self::OAUTH2_REVOKE_URI, 'POST', array(), "token=$token");
+	$response = Google_Client::$io->makeRequest($request);
+	$code = $response->getResponseHttpCode();
+	if ($code == 200) {
+	  $this->token = null;
+	  return true;
+	}
+
+	return false;
   }
 
   /**
@@ -316,34 +316,34 @@ 
    * @return bool Returns True if the access_token is expired.
    */
   public function isAccessTokenExpired() {
-    if (null == $this->token) {
-      return true;
-    }
+	if (null == $this->token) {
+	  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;
   }
 
   // Gets federated sign-on certificates to use for verifying identity tokens.
   // Returns certs as array structure, where keys are key ids, and values
   // are PEM encoded certificates.
   private function getFederatedSignOnCerts() {
-    // This relies on makeRequest caching certificate responses.
-    $request = Google_Client::$io->makeRequest(new Google_HttpRequest(
-        self::OAUTH2_FEDERATED_SIGNON_CERTS_URL));
-    if ($request->getResponseHttpCode() == 200) {
-      $certs = json_decode($request->getResponseBody(), true);
-      if ($certs) {
-        return $certs;
-      }
-    }
-    throw new Google_AuthException(
-        "Failed to retrieve verification certificates: '" .
-            $request->getResponseBody() . "'.",
-        $request->getResponseHttpCode());
+	// This relies on makeRequest caching certificate responses.
+	$request = Google_Client::$io->makeRequest(new Google_HttpRequest(
+		self::OAUTH2_FEDERATED_SIGNON_CERTS_URL));
+	if ($request->getResponseHttpCode() == 200) {
+	  $certs = json_decode($request->getResponseBody(), true);
+	  if ($certs) {
+		return $certs;
+	  }
+	}
+	throw new Google_AuthException(
+		"Failed to retrieve verification certificates: '" .
+			$request->getResponseBody() . "'.",
+		$request->getResponseHttpCode());
   }
 
   /**
@@ -357,97 +357,97 @@ 
    * @return Google_LoginTicket
    */
   public function verifyIdToken($id_token = null, $audience = null) {
-    if (!$id_token) {
-      $id_token = $this->token['id_token'];
-    }
-
-    $certs = $this->getFederatedSignonCerts();
-    if (!$audience) {
-      $audience = $this->clientId;
-    }
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience);
+	if (!$id_token) {
+	  $id_token = $this->token['id_token'];
+	}
+
+	$certs = $this->getFederatedSignonCerts();
+	if (!$audience) {
+	  $audience = $this->clientId;
+	}
+	return $this->verifySignedJwtWithCerts($id_token, $certs, $audience);
   }
 
   // Verifies the id token, returns the verified token contents.
   // Visible for testing.
   function verifySignedJwtWithCerts($jwt, $certs, $required_audience) {
-    $segments = explode(".", $jwt);
-    if (count($segments) != 3) {
-      throw new Google_AuthException("Wrong number of segments in token: $jwt");
-    }
-    $signed = $segments[0] . "." . $segments[1];
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
-
-    // Parse envelope.
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
-    if (!$envelope) {
-      throw new Google_AuthException("Can't parse token envelope: " . $segments[0]);
-    }
-
-    // Parse token
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
-    $payload = json_decode($json_body, true);
-    if (!$payload) {
-      throw new Google_AuthException("Can't parse token payload: " . $segments[1]);
-    }
-
-    // Check signature
-    $verified = false;
-    foreach ($certs as $keyName => $pem) {
-      $public_key = new Google_PemVerifier($pem);
-      if ($public_key->verify($signed, $signature)) {
-        $verified = true;
-        break;
-      }
-    }
-
-    if (!$verified) {
-      throw new Google_AuthException("Invalid token signature: $jwt");
-    }
-
-    // Check issued-at timestamp
-    $iat = 0;
-    if (array_key_exists("iat", $payload)) {
-      $iat = $payload["iat"];
-    }
-    if (!$iat) {
-      throw new Google_AuthException("No issue time in token: $json_body");
-    }
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
-
-    // Check expiration timestamp
-    $now = time();
-    $exp = 0;
-    if (array_key_exists("exp", $payload)) {
-      $exp = $payload["exp"];
-    }
-    if (!$exp) {
-      throw new Google_AuthException("No expiration time in token: $json_body");
-    }
-    if ($exp >= $now + self::MAX_TOKEN_LIFETIME_SECS) {
-      throw new Google_AuthException(
-          "Expiration time too far in future: $json_body");
-    }
-
-    $latest = $exp + self::CLOCK_SKEW_SECS;
-    if ($now < $earliest) {
-      throw new Google_AuthException(
-          "Token used too early, $now < $earliest: $json_body");
-    }
-    if ($now > $latest) {
-      throw new Google_AuthException(
-          "Token used too late, $now > $latest: $json_body");
-    }
-
-    // TODO(beaton): check issuer field?
-
-    // Check audience
-    $aud = $payload["aud"];
-    if ($aud != $required_audience) {
-      throw new Google_AuthException("Wrong recipient, $aud != $required_audience: $json_body");
-    }
-
-    // All good.
-    return new Google_LoginTicket($envelope, $payload);
+	$segments = explode(".", $jwt);
+	if (count($segments) != 3) {
+	  throw new Google_AuthException("Wrong number of segments in token: $jwt");
+	}
+	$signed = $segments[0] . "." . $segments[1];
+	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+	// Parse envelope.
+	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+	if (!$envelope) {
+	  throw new Google_AuthException("Can't parse token envelope: " . $segments[0]);
+	}
+
+	// Parse token
+	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+	$payload = json_decode($json_body, true);
+	if (!$payload) {
+	  throw new Google_AuthException("Can't parse token payload: " . $segments[1]);
+	}
+
+	// Check signature
+	$verified = false;
+	foreach ($certs as $keyName => $pem) {
+	  $public_key = new Google_PemVerifier($pem);
+	  if ($public_key->verify($signed, $signature)) {
+		$verified = true;
+		break;
+	  }
+	}
+
+	if (!$verified) {
+	  throw new Google_AuthException("Invalid token signature: $jwt");
+	}
+
+	// Check issued-at timestamp
+	$iat = 0;
+	if (array_key_exists("iat", $payload)) {
+	  $iat = $payload["iat"];
+	}
+	if (!$iat) {
+	  throw new Google_AuthException("No issue time in token: $json_body");
+	}
+	$earliest = $iat - self::CLOCK_SKEW_SECS;
+
+	// Check expiration timestamp
+	$now = time();
+	$exp = 0;
+	if (array_key_exists("exp", $payload)) {
+	  $exp = $payload["exp"];
+	}
+	if (!$exp) {
+	  throw new Google_AuthException("No expiration time in token: $json_body");
+	}
+	if ($exp >= $now + self::MAX_TOKEN_LIFETIME_SECS) {
+	  throw new Google_AuthException(
+		  "Expiration time too far in future: $json_body");
+	}
+
+	$latest = $exp + self::CLOCK_SKEW_SECS;
+	if ($now < $earliest) {
+	  throw new Google_AuthException(
+		  "Token used too early, $now < $earliest: $json_body");
+	}
+	if ($now > $latest) {
+	  throw new Google_AuthException(
+		  "Token used too late, $now > $latest: $json_body");
+	}
+
+	// TODO(beaton): check issuer field?
+
+	// Check audience
+	$aud = $payload["aud"];
+	if ($aud != $required_audience) {
+	  throw new Google_AuthException("Wrong recipient, $aud != $required_audience: $json_body");
+	}
+
+	// All good.
+	return new Google_LoginTicket($envelope, $payload);
   }
 }

Spacing +27 added lines, -27 removed lines

@@ -17,7 +17,7 @@ 
 
 require_once "Google_Verifier.php";
 require_once "Google_LoginTicket.php";
-require_once GA_API_Path. "service/Google_Utils.php";
+require_once GA_API_Path."service/Google_Utils.php";
 
 /**
  * Authentication class that deals with the OAuth 2 web-server authentication flow
@@ -55,27 +55,27 @@ 
   public function __construct() {
     global $apiConfig;
 
-    if (! empty($apiConfig['developer_key'])) {
+    if (!empty($apiConfig['developer_key'])) {
       $this->developerKey = $apiConfig['developer_key'];
     }
 
-    if (! empty($apiConfig['oauth2_client_id'])) {
+    if (!empty($apiConfig['oauth2_client_id'])) {
       $this->clientId = $apiConfig['oauth2_client_id'];
     }
 
-    if (! empty($apiConfig['oauth2_client_secret'])) {
+    if (!empty($apiConfig['oauth2_client_secret'])) {
       $this->clientSecret = $apiConfig['oauth2_client_secret'];
     }
 
-    if (! empty($apiConfig['oauth2_redirect_uri'])) {
+    if (!empty($apiConfig['oauth2_redirect_uri'])) {
       $this->redirectUri = $apiConfig['oauth2_redirect_uri'];
     }
 
-    if (! empty($apiConfig['oauth2_access_type'])) {
+    if (!empty($apiConfig['oauth2_access_type'])) {
       $this->accessType = $apiConfig['oauth2_access_type'];
     }
 
-    if (! empty($apiConfig['oauth2_approval_prompt'])) {
+    if (!empty($apiConfig['oauth2_approval_prompt'])) {
       $this->approvalPrompt = $apiConfig['oauth2_approval_prompt'];
     }
 
@@ -117,7 +117,7 @@ 
     }
 
     $authUrl = $this->createAuthUrl($service['scope']);
-    header('Location: ' . $authUrl);
+    header('Location: '.$authUrl);
     return true;
   }
 
@@ -131,25 +131,25 @@ 
   public function createAuthUrl($scope) {
     $params = array(
         'response_type=code',
-        'redirect_uri=' . urlencode($this->redirectUri),
-        'client_id=' . urlencode($this->clientId),
-        'scope=' . urlencode($scope),
-        'access_type=' . urlencode($this->accessType),
-        'approval_prompt=' . urlencode($this->approvalPrompt),
+        'redirect_uri='.urlencode($this->redirectUri),
+        'client_id='.urlencode($this->clientId),
+        'scope='.urlencode($scope),
+        'access_type='.urlencode($this->accessType),
+        'approval_prompt='.urlencode($this->approvalPrompt),
     );
 
     // if the list of scopes contains plus.login, add request_visible_actions
     // to auth URL
-    if(strpos($scope, 'plus.login') && count($this->requestVisibleActions) > 0) {
-        $params[] = 'request_visible_actions=' .
+    if (strpos($scope, 'plus.login') && count($this->requestVisibleActions) > 0) {
+        $params[] = 'request_visible_actions='.
             urlencode($this->requestVisibleActions);
     }
 
     if (isset($this->state)) {
-      $params[] = 'state=' . urlencode($this->state);
+      $params[] = 'state='.urlencode($this->state);
     }
     $params = implode('&', $params);
-    return self::OAUTH2_AUTH_URL . "?$params";
+    return self::OAUTH2_AUTH_URL."?$params";
   }
 
   /**
@@ -161,7 +161,7 @@ 
     if ($token == null) {
       throw new Google_AuthException('Could not json decode the token');
     }
-    if (! isset($token['access_token'])) {
+    if (!isset($token['access_token'])) {
       throw new Google_AuthException("Invalid token format");
     }
     $this->token = $token;
@@ -202,7 +202,7 @@ 
     if ($this->developerKey) {
       $requestUrl = $request->getUrl();
       $requestUrl .= (strpos($request->getUrl(), '?') === false) ? '?' : '&';
-      $requestUrl .=  'key=' . urlencode($this->developerKey);
+      $requestUrl .= 'key='.urlencode($this->developerKey);
       $request->setUrl($requestUrl);
     }
 
@@ -217,7 +217,7 @@ 
       if ($this->assertionCredentials) {
         $this->refreshTokenWithAssertion();
       } else {
-        if (! array_key_exists('refresh_token', $this->token)) {
+        if (!array_key_exists('refresh_token', $this->token)) {
             throw new Google_AuthException("The OAuth 2.0 access token has expired, "
                 . "and a refresh token is not available. Refresh tokens are not "
                 . "returned for responses that were auto-approved.");
@@ -228,7 +228,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;
@@ -277,7 +277,7 @@ 
         throw new Google_AuthException("Could not json decode the access token");
       }
 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+      if (!isset($token['access_token']) || !isset($token['expires_in'])) {
         throw new Google_AuthException("Invalid token format");
       }
 
@@ -341,8 +341,8 @@ 
       }
     }
     throw new Google_AuthException(
-        "Failed to retrieve verification certificates: '" .
-            $request->getResponseBody() . "'.",
+        "Failed to retrieve verification certificates: '".
+            $request->getResponseBody()."'.",
         $request->getResponseHttpCode());
   }
 
@@ -375,20 +375,20 @@ 
     if (count($segments) != 3) {
       throw new Google_AuthException("Wrong number of segments in token: $jwt");
     }
-    $signed = $segments[0] . "." . $segments[1];
+    $signed = $segments[0].".".$segments[1];
     $signature = Google_Utils::urlSafeB64Decode($segments[2]);
 
     // Parse envelope.
     $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
     if (!$envelope) {
-      throw new Google_AuthException("Can't parse token envelope: " . $segments[0]);
+      throw new Google_AuthException("Can't parse token envelope: ".$segments[0]);
     }
 
     // Parse token
     $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
     $payload = json_decode($json_body, true);
     if (!$payload) {
-      throw new Google_AuthException("Can't parse token payload: " . $segments[1]);
+      throw new Google_AuthException("Can't parse token payload: ".$segments[1]);
     }
 
     // Check signature

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

Indentation +9 added lines, -9 removed lines

@@ -24,10 +24,10 @@ 
   public $key = null;
 
   public function __construct() {
-    global $apiConfig;
-    if (!empty($apiConfig['developer_key'])) {
-      $this->setDeveloperKey($apiConfig['developer_key']);
-    }
+	global $apiConfig;
+	if (!empty($apiConfig['developer_key'])) {
+	  $this->setDeveloperKey($apiConfig['developer_key']);
+	}
   }
 
   public function setDeveloperKey($key) {$this->key = $key;}
@@ -39,10 +39,10 @@ 
   public function revokeToken() {/* noop*/}
 
   public function sign(Google_HttpRequest $request) {
-    if ($this->key) {
-      $request->setUrl($request->getUrl() . ((strpos($request->getUrl(), '?') === false) ? '?' : '&')
-          . 'key='.urlencode($this->key));
-    }
-    return $request;
+	if ($this->key) {
+	  $request->setUrl($request->getUrl() . ((strpos($request->getUrl(), '?') === false) ? '?' : '&')
+		  . 'key='.urlencode($this->key));
+	}
+	return $request;
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -30,17 +30,17 @@
     }
   }
 
-  public function setDeveloperKey($key) {$this->key = $key;}
+  public function setDeveloperKey($key) {$this->key = $key; }
   public function authenticate($service) {/*noop*/}
   public function setAccessToken($accessToken) {/* noop*/}
-  public function getAccessToken() {return null;}
-  public function createAuthUrl($scope) {return null;}
+  public function getAccessToken() {return null; }
+  public function createAuthUrl($scope) {return null; }
   public function refreshToken($refreshToken) {/* noop*/}
   public function revokeToken() {/* noop*/}
 
   public function sign(Google_HttpRequest $request) {
     if ($this->key) {
-      $request->setUrl($request->getUrl() . ((strpos($request->getUrl(), '?') === false) ? '?' : '&')
+      $request->setUrl($request->getUrl().((strpos($request->getUrl(), '?') === false) ? '?' : '&')
           . 'key='.urlencode($this->key));
     }
     return $request;

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

Indentation +7 added lines, -7 removed lines

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

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

Indentation +37 added lines, -37 removed lines

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

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

Indentation +61 added lines, -61 removed lines

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

Spacing +5 added lines, -5 removed lines

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

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

Indentation +62 added lines, -62 removed lines

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

Spacing +7 added lines, -7 removed lines

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