GeoDirectory / geodirectory

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

Indentation +24 added lines, -24 removed lines

@@ -43,23 +43,23 @@ 
    * @param array|null $retryMap Map of errors with retry counts.
    */
   public function __construct(
-      $message,
-      $code = 0,
-      Exception $previous = null,
-      $errors = array(),
-      array $retryMap = null
+	  $message,
+	  $code = 0,
+	  Exception $previous = null,
+	  $errors = array(),
+	  array $retryMap = null
   ) {
-    if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-      parent::__construct($message, $code, $previous);
-    } else {
-      parent::__construct($message, $code);
-    }
+	if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+	  parent::__construct($message, $code, $previous);
+	} else {
+	  parent::__construct($message, $code);
+	}
 
-    $this->errors = $errors;
+	$this->errors = $errors;
 
-    if (is_array($retryMap)) {
-      $this->retryMap = $retryMap;
-    }
+	if (is_array($retryMap)) {
+	  $this->retryMap = $retryMap;
+	}
   }
 
   /**
@@ -77,7 +77,7 @@ 
    */
   public function getErrors()
   {
-    return $this->errors;
+	return $this->errors;
   }
 
   /**
@@ -89,17 +89,17 @@ 
    */
   public function allowedRetries()
   {
-    if (isset($this->retryMap[$this->code])) {
-      return $this->retryMap[$this->code];
-    }
+	if (isset($this->retryMap[$this->code])) {
+	  return $this->retryMap[$this->code];
+	}
 
-    $errors = $this->getErrors();
+	$errors = $this->getErrors();
 
-    if (!empty($errors) && isset($errors[0]['reason']) &&
-        isset($this->retryMap[$errors[0]['reason']])) {
-      return $this->retryMap[$errors[0]['reason']];
-    }
+	if (!empty($errors) && isset($errors[0]['reason']) &&
+		isset($this->retryMap[$errors[0]['reason']])) {
+	  return $this->retryMap[$errors[0]['reason']];
+	}
 
-    return 0;
+	return 0;
   }
 }

Spacing +1 added lines, -1 removed lines

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

geodirectory-admin/google-api-php-client/src/Google/Signer/P12.php

Indentation +46 added lines, -46 removed lines

@@ -34,61 +34,61 @@
   // Creates a new signer from a .p12 file.
   public function __construct($p12, $password)
   {
-    if (!function_exists('openssl_x509_read')) {
-      throw new Google_Exception(
-          'The Google PHP API library needs the openssl PHP extension'
-      );
-    }
+	if (!function_exists('openssl_x509_read')) {
+	  throw new Google_Exception(
+		  'The Google PHP API library needs the openssl PHP extension'
+	  );
+	}
 
-    // If the private key is provided directly, then this isn't in the p12
-    // format. Different versions of openssl support different p12 formats
-    // and the key from google wasn't being accepted by the version available
-    // at the time.
-    if (!$password && strpos($p12, "-----BEGIN RSA PRIVATE KEY-----") !== false) {
-      $this->privateKey = openssl_pkey_get_private($p12);
-    } elseif ($password === 'notasecret' && strpos($p12, "-----BEGIN PRIVATE KEY-----") !== false) {
-      $this->privateKey = openssl_pkey_get_private($p12);
-    } else {
-      // This throws on error
-      $certs = array();
-      if (!openssl_pkcs12_read($p12, $certs, $password)) {
-        throw new Google_Auth_Exception(
-            "Unable to parse the p12 file.  " .
-            "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
-            openssl_error_string()
-        );
-      }
-      // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
-      // method?  What happens if there are multiple private keys?  Do we care?
-      if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
-        throw new Google_Auth_Exception("No private key found in p12 file.");
-      }
-      $this->privateKey = openssl_pkey_get_private($certs['pkey']);
-    }
+	// If the private key is provided directly, then this isn't in the p12
+	// format. Different versions of openssl support different p12 formats
+	// and the key from google wasn't being accepted by the version available
+	// at the time.
+	if (!$password && strpos($p12, "-----BEGIN RSA PRIVATE KEY-----") !== false) {
+	  $this->privateKey = openssl_pkey_get_private($p12);
+	} elseif ($password === 'notasecret' && strpos($p12, "-----BEGIN PRIVATE KEY-----") !== false) {
+	  $this->privateKey = openssl_pkey_get_private($p12);
+	} else {
+	  // This throws on error
+	  $certs = array();
+	  if (!openssl_pkcs12_read($p12, $certs, $password)) {
+		throw new Google_Auth_Exception(
+			"Unable to parse the p12 file.  " .
+			"Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
+			openssl_error_string()
+		);
+	  }
+	  // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
+	  // method?  What happens if there are multiple private keys?  Do we care?
+	  if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
+		throw new Google_Auth_Exception("No private key found in p12 file.");
+	  }
+	  $this->privateKey = openssl_pkey_get_private($certs['pkey']);
+	}
 
-    if (!$this->privateKey) {
-      throw new Google_Auth_Exception("Unable to load private key");
-    }
+	if (!$this->privateKey) {
+	  throw new Google_Auth_Exception("Unable to load private key");
+	}
   }
 
   public function __destruct()
   {
-    if ($this->privateKey) {
-      openssl_pkey_free($this->privateKey);
-    }
+	if ($this->privateKey) {
+	  openssl_pkey_free($this->privateKey);
+	}
   }
 
   public function sign($data)
   {
-    if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-      throw new Google_Auth_Exception(
-          "PHP 5.3.0 or higher is required to use service accounts."
-      );
-    }
-    $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
-    if (!openssl_sign($data, $signature, $this->privateKey, $hash)) {
-      throw new Google_Auth_Exception("Unable to sign data");
-    }
-    return $signature;
+	if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+	  throw new Google_Auth_Exception(
+		  "PHP 5.3.0 or higher is required to use service accounts."
+	  );
+	}
+	$hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
+	if (!openssl_sign($data, $signature, $this->privateKey, $hash)) {
+	  throw new Google_Auth_Exception("Unable to sign data");
+	}
+	return $signature;
   }
 }

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';
 }
 
 /**
@@ -53,8 +53,8 @@ 
       $certs = array();
       if (!openssl_pkcs12_read($p12, $certs, $password)) {
         throw new Google_Auth_Exception(
-            "Unable to parse the p12 file.  " .
-            "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
+            "Unable to parse the p12 file.  ".
+            "Is this a .p12 file?  Is the password correct?  OpenSSL error: ".
             openssl_error_string()
         );
       }

geodirectory-admin/google-api-php-client/src/Google/Utils/URITemplate.php

Indentation +229 added lines, -229 removed lines

@@ -32,13 +32,13 @@ 
    * processed.
    */
   private $operators = array(
-      "+" => "reserved",
-      "/" => "segments",
-      "." => "dotprefix",
-      "#" => "fragment",
-      ";" => "semicolon",
-      "?" => "form",
-      "&" => "continuation"
+	  "+" => "reserved",
+	  "/" => "segments",
+	  "." => "dotprefix",
+	  "#" => "fragment",
+	  ";" => "semicolon",
+	  "?" => "form",
+	  "&" => "continuation"
   );
 
   /**
@@ -47,18 +47,18 @@ 
    * strings.
    */
   private $reserved = array(
-      "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
+	  "=", ",", "!", "@", "|", ":", "/", "?", "#",
+	  "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
   );
   private $reservedEncoded = array(
-    "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
-    "%23", "%5B", "%5D", "%24", "%26", "%27", "%28", "%29",
-    "%2A", "%2B", "%3B"
+	"%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
+	"%23", "%5B", "%5D", "%24", "%26", "%27", "%28", "%29",
+	"%2A", "%2B", "%3B"
   );
 
   public function parse($string, array $parameters)
   {
-    return $this->resolveNextSection($string, $parameters);
+	return $this->resolveNextSection($string, $parameters);
   }
 
   /**
@@ -68,208 +68,208 @@ 
    */
   private function resolveNextSection($string, $parameters)
   {
-    $start = strpos($string, "{");
-    if ($start === false) {
-      return $string;
-    }
-    $end = strpos($string, "}");
-    if ($end === false) {
-      return $string;
-    }
-    $string = $this->replace($string, $start, $end, $parameters);
-    return $this->resolveNextSection($string, $parameters);
+	$start = strpos($string, "{");
+	if ($start === false) {
+	  return $string;
+	}
+	$end = strpos($string, "}");
+	if ($end === false) {
+	  return $string;
+	}
+	$string = $this->replace($string, $start, $end, $parameters);
+	return $this->resolveNextSection($string, $parameters);
   }
 
   private function replace($string, $start, $end, $parameters)
   {
-    // We know a data block will have {} round it, so we can strip that.
-    $data = substr($string, $start + 1, $end - $start - 1);
+	// We know a data block will have {} round it, so we can strip that.
+	$data = substr($string, $start + 1, $end - $start - 1);
 
-    // If the first character is one of the reserved operators, it effects
-    // the processing of the stream.
-    if (isset($this->operators[$data[0]])) {
-      $op = $this->operators[$data[0]];
-      $data = substr($data, 1);
-      $prefix = "";
-      $prefix_on_missing = false;
+	// If the first character is one of the reserved operators, it effects
+	// the processing of the stream.
+	if (isset($this->operators[$data[0]])) {
+	  $op = $this->operators[$data[0]];
+	  $data = substr($data, 1);
+	  $prefix = "";
+	  $prefix_on_missing = false;
 
-      switch ($op) {
-        case "reserved":
-          // Reserved means certain characters should not be URL encoded
-          $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
-        case "fragment":
-          // Comma separated with fragment prefix. Bare values only.
-          $prefix = "#";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
-        case "segments":
-          // Slash separated data. Bare values only.
-          $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
-          break;
-        case "dotprefix":
-          // Dot separated data. Bare values only.
-          $prefix = ".";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ".");
-          break;
-        case "semicolon":
-          // Semicolon prefixed and separated. Uses the key name
-          $prefix = ";";
-          $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
-          break;
-        case "form":
-          // Standard URL format. Uses the key name
-          $prefix = "?";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
-        case "continuation":
-          // Standard URL, but with leading ampersand. Uses key name.
-          $prefix = "&";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
-      }
+	  switch ($op) {
+		case "reserved":
+		  // Reserved means certain characters should not be URL encoded
+		  $data = $this->replaceVars($data, $parameters, ",", null, true);
+		  break;
+		case "fragment":
+		  // Comma separated with fragment prefix. Bare values only.
+		  $prefix = "#";
+		  $prefix_on_missing = true;
+		  $data = $this->replaceVars($data, $parameters, ",", null, true);
+		  break;
+		case "segments":
+		  // Slash separated data. Bare values only.
+		  $prefix = "/";
+		  $data =$this->replaceVars($data, $parameters, "/");
+		  break;
+		case "dotprefix":
+		  // Dot separated data. Bare values only.
+		  $prefix = ".";
+		  $prefix_on_missing = true;
+		  $data = $this->replaceVars($data, $parameters, ".");
+		  break;
+		case "semicolon":
+		  // Semicolon prefixed and separated. Uses the key name
+		  $prefix = ";";
+		  $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
+		  break;
+		case "form":
+		  // Standard URL format. Uses the key name
+		  $prefix = "?";
+		  $data = $this->replaceVars($data, $parameters, "&", "=");
+		  break;
+		case "continuation":
+		  // Standard URL, but with leading ampersand. Uses key name.
+		  $prefix = "&";
+		  $data = $this->replaceVars($data, $parameters, "&", "=");
+		  break;
+	  }
 
-      // Add the initial prefix character if data is valid.
-      if ($data || ($data !== false && $prefix_on_missing)) {
-        $data = $prefix . $data;
-      }
+	  // Add the initial prefix character if data is valid.
+	  if ($data || ($data !== false && $prefix_on_missing)) {
+		$data = $prefix . $data;
+	  }
 
-    } else {
-      // If no operator we replace with the defaults.
-      $data = $this->replaceVars($data, $parameters);
-    }
-    // This is chops out the {...} and replaces with the new section.
-    return substr($string, 0, $start) . $data . substr($string, $end + 1);
+	} else {
+	  // If no operator we replace with the defaults.
+	  $data = $this->replaceVars($data, $parameters);
+	}
+	// This is chops out the {...} and replaces with the new section.
+	return substr($string, 0, $start) . $data . substr($string, $end + 1);
   }
 
   private function replaceVars(
-      $section,
-      $parameters,
-      $sep = ",",
-      $combine = null,
-      $reserved = false,
-      $tag_empty = false,
-      $combine_on_empty = true
+	  $section,
+	  $parameters,
+	  $sep = ",",
+	  $combine = null,
+	  $reserved = false,
+	  $tag_empty = false,
+	  $combine_on_empty = true
   ) {
-    if (strpos($section, ",") === false) {
-      // If we only have a single value, we can immediately process.
-      return $this->combine(
-          $section,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
-    } else {
-      // If we have multiple values, we need to split and loop over them.
-      // Each is treated individually, then glued together with the
-      // separator character.
-      $vars = explode(",", $section);
-      return $this->combineList(
-          $vars,
-          $sep,
-          $parameters,
-          $combine,
-          $reserved,
-          false, // Never emit empty strings in multi-param replacements
-          $combine_on_empty
-      );
-    }
+	if (strpos($section, ",") === false) {
+	  // If we only have a single value, we can immediately process.
+	  return $this->combine(
+		  $section,
+		  $parameters,
+		  $sep,
+		  $combine,
+		  $reserved,
+		  $tag_empty,
+		  $combine_on_empty
+	  );
+	} else {
+	  // If we have multiple values, we need to split and loop over them.
+	  // Each is treated individually, then glued together with the
+	  // separator character.
+	  $vars = explode(",", $section);
+	  return $this->combineList(
+		  $vars,
+		  $sep,
+		  $parameters,
+		  $combine,
+		  $reserved,
+		  false, // Never emit empty strings in multi-param replacements
+		  $combine_on_empty
+	  );
+	}
   }
  
   public function combine(
-      $key,
-      $parameters,
-      $sep,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
+	  $key,
+	  $parameters,
+	  $sep,
+	  $combine,
+	  $reserved,
+	  $tag_empty,
+	  $combine_on_empty
   ) {
-    $length = false;
-    $explode = false;
-    $skip_final_combine = false;
-    $value = false;
+	$length = false;
+	$explode = false;
+	$skip_final_combine = false;
+	$value = false;
 
-    // Check for length restriction.
-    if (strpos($key, ":") !== false) {
-      list($key, $length) = explode(":", $key);
-    }
+	// Check for length restriction.
+	if (strpos($key, ":") !== false) {
+	  list($key, $length) = explode(":", $key);
+	}
     
-    // Check for explode parameter.
-    if ($key[strlen($key) - 1] == "*") {
-      $explode = true;
-      $key = substr($key, 0, -1);
-      $skip_final_combine = true;
-    }
+	// Check for explode parameter.
+	if ($key[strlen($key) - 1] == "*") {
+	  $explode = true;
+	  $key = substr($key, 0, -1);
+	  $skip_final_combine = true;
+	}
     
-    // Define the list separator.
-    $list_sep = $explode ? $sep : ",";
+	// Define the list separator.
+	$list_sep = $explode ? $sep : ",";
     
-    if (isset($parameters[$key])) {
-      $data_type = $this->getDataType($parameters[$key]);
-      switch ($data_type) {
-        case self::TYPE_SCALAR:
-          $value = $this->getValue($parameters[$key], $length);
-          break;
-        case self::TYPE_LIST:
-          $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
-            $pvalue = $this->getValue($pvalue, $length);
-            if ($combine && $explode) {
-              $values[$pkey] = $key . $combine . $pvalue;
-            } else {
-              $values[$pkey] = $pvalue;
-            }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
-            return '';
-          }
-          break;
-        case self::TYPE_MAP:
-          $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
-            $pvalue = $this->getValue($pvalue, $length);
-            if ($explode) {
-              $pkey = $this->getValue($pkey, $length);
-              $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
-            } else {
-              $values[] = $pkey;
-              $values[] = $pvalue;
-            }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
-            return false;
-          }
-          break;
-      }
-    } else if ($tag_empty) {
-      // If we are just indicating empty values with their key name, return that.
-      return $key;
-    } else {
-      // Otherwise we can skip this variable due to not being defined.
-      return false;
-    }
+	if (isset($parameters[$key])) {
+	  $data_type = $this->getDataType($parameters[$key]);
+	  switch ($data_type) {
+		case self::TYPE_SCALAR:
+		  $value = $this->getValue($parameters[$key], $length);
+		  break;
+		case self::TYPE_LIST:
+		  $values = array();
+		  foreach ($parameters[$key] as $pkey => $pvalue) {
+			$pvalue = $this->getValue($pvalue, $length);
+			if ($combine && $explode) {
+			  $values[$pkey] = $key . $combine . $pvalue;
+			} else {
+			  $values[$pkey] = $pvalue;
+			}
+		  }
+		  $value = implode($list_sep, $values);
+		  if ($value == '') {
+			return '';
+		  }
+		  break;
+		case self::TYPE_MAP:
+		  $values = array();
+		  foreach ($parameters[$key] as $pkey => $pvalue) {
+			$pvalue = $this->getValue($pvalue, $length);
+			if ($explode) {
+			  $pkey = $this->getValue($pkey, $length);
+			  $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
+			} else {
+			  $values[] = $pkey;
+			  $values[] = $pvalue;
+			}
+		  }
+		  $value = implode($list_sep, $values);
+		  if ($value == '') {
+			return false;
+		  }
+		  break;
+	  }
+	} else if ($tag_empty) {
+	  // If we are just indicating empty values with their key name, return that.
+	  return $key;
+	} else {
+	  // Otherwise we can skip this variable due to not being defined.
+	  return false;
+	}
 
-    if ($reserved) {
-      $value = str_replace($this->reservedEncoded, $this->reserved, $value);
-    }
+	if ($reserved) {
+	  $value = str_replace($this->reservedEncoded, $this->reserved, $value);
+	}
 
-    // If we do not need to include the key name, we just return the raw
-    // value.
-    if (!$combine || $skip_final_combine) {
-      return $value;
-    }
+	// If we do not need to include the key name, we just return the raw
+	// value.
+	if (!$combine || $skip_final_combine) {
+	  return $value;
+	}
         
-    // Else we combine the key name: foo=bar, if value is not the empty string.
-    return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
+	// Else we combine the key name: foo=bar, if value is not the empty string.
+	return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
   }
   
   /**
@@ -277,14 +277,14 @@ 
    */
   private function getDataType($data)
   {
-    if (is_array($data)) {
-      reset($data);
-      if (key($data) !== 0) {
-        return self::TYPE_MAP;
-      }
-      return self::TYPE_LIST;
-    }
-    return self::TYPE_SCALAR;
+	if (is_array($data)) {
+	  reset($data);
+	  if (key($data) !== 0) {
+		return self::TYPE_MAP;
+	  }
+	  return self::TYPE_LIST;
+	}
+	return self::TYPE_SCALAR;
   }
   
   /**
@@ -292,31 +292,31 @@ 
    * for multi-key templates.
    */
   private function combineList(
-      $vars,
-      $sep,
-      $parameters,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
+	  $vars,
+	  $sep,
+	  $parameters,
+	  $combine,
+	  $reserved,
+	  $tag_empty,
+	  $combine_on_empty
   ) {
-    $ret = array();
-    foreach ($vars as $var) {
-      $response = $this->combine(
-          $var,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
-      if ($response === false) {
-        continue;
-      }
-      $ret[] = $response;
-    }
-    return implode($sep, $ret);
+	$ret = array();
+	foreach ($vars as $var) {
+	  $response = $this->combine(
+		  $var,
+		  $parameters,
+		  $sep,
+		  $combine,
+		  $reserved,
+		  $tag_empty,
+		  $combine_on_empty
+	  );
+	  if ($response === false) {
+		continue;
+	  }
+	  $ret[] = $response;
+	}
+	return implode($sep, $ret);
   }
   
   /**
@@ -324,10 +324,10 @@ 
    */
   private function getValue($value, $length)
   {
-    if ($length) {
-      $value = substr($value, 0, $length);
-    }
-    $value = rawurlencode($value);
-    return $value;
+	if ($length) {
+	  $value = substr($value, 0, $length);
+	}
+	$value = rawurlencode($value);
+	return $value;
   }
 }

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
    */
   private $reserved = array(
       "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
+      "[", "]", '$', "&", "'", "(", ")", "*", "+", ";"
   );
   private $reservedEncoded = array(
     "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
@@ -107,7 +107,7 @@ 
         case "segments":
           // Slash separated data. Bare values only.
           $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
+          $data = $this->replaceVars($data, $parameters, "/");
           break;
         case "dotprefix":
           // Dot separated data. Bare values only.
@@ -134,7 +134,7 @@ 
 
       // Add the initial prefix character if data is valid.
       if ($data || ($data !== false && $prefix_on_missing)) {
-        $data = $prefix . $data;
+        $data = $prefix.$data;
       }
 
     } else {
@@ -142,7 +142,7 @@ 
       $data = $this->replaceVars($data, $parameters);
     }
     // This is chops out the {...} and replaces with the new section.
-    return substr($string, 0, $start) . $data . substr($string, $end + 1);
+    return substr($string, 0, $start).$data.substr($string, $end + 1);
   }
 
   private function replaceVars(
@@ -222,7 +222,7 @@ 
           foreach ($parameters[$key] as $pkey => $pvalue) {
             $pvalue = $this->getValue($pvalue, $length);
             if ($combine && $explode) {
-              $values[$pkey] = $key . $combine . $pvalue;
+              $values[$pkey] = $key.$combine.$pvalue;
             } else {
               $values[$pkey] = $pvalue;
             }
@@ -238,7 +238,7 @@ 
             $pvalue = $this->getValue($pvalue, $length);
             if ($explode) {
               $pkey = $this->getValue($pkey, $length);
-              $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
+              $values[] = $pkey."=".$pvalue; // Explode triggers = combine.
             } else {
               $values[] = $pkey;
               $values[] = $pvalue;
@@ -269,7 +269,7 @@ 
     }
         
     // Else we combine the key name: foo=bar, if value is not the empty string.
-    return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
+    return $key.($value != '' || $combine_on_empty ? $combine.$value : '');
   }
   
   /**

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

Indentation +7 added lines, -7 removed lines

@@ -42,8 +42,8 @@ 
    */
   public function __construct($envelope, $payload)
   {
-    $this->envelope = $envelope;
-    $this->payload = $payload;
+	$this->envelope = $envelope;
+	$this->payload = $payload;
   }
 
   /**
@@ -53,10 +53,10 @@ 
    */
   public function getUserId()
   {
-    if (array_key_exists(self::USER_ATTR, $this->payload)) {
-      return $this->payload[self::USER_ATTR];
-    }
-    throw new Google_Auth_Exception("No user_id in token");
+	if (array_key_exists(self::USER_ATTR, $this->payload)) {
+	  return $this->payload[self::USER_ATTR];
+	}
+	throw new Google_Auth_Exception("No user_id in token");
   }
 
   /**
@@ -66,6 +66,6 @@ 
    */
   public function getAttributes()
   {
-    return array("envelope" => $this->envelope, "payload" => $this->payload);
+	return array("envelope" => $this->envelope, "payload" => $this->payload);
   }
 }

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