GeoDirectory / geodirectory

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

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
  */
 class Google_Utils
 {
+  /**
+   * @param string $data
+   */
   public static function urlSafeB64Encode($data)
   {
     $b64 = base64_encode($data);

Indentation +64 added lines, -64 removed lines

@@ -23,23 +23,23 @@ 
 {
   public static function urlSafeB64Encode($data)
   {
-    $b64 = base64_encode($data);
-    $b64 = str_replace(
-        array('+', '/', '\r', '\n', '='),
-        array('-', '_'),
-        $b64
-    );
-    return $b64;
+	$b64 = base64_encode($data);
+	$b64 = str_replace(
+		array('+', '/', '\r', '\n', '='),
+		array('-', '_'),
+		$b64
+	);
+	return $b64;
   }
 
   public static function urlSafeB64Decode($b64)
   {
-    $b64 = str_replace(
-        array('-', '_'),
-        array('+', '/'),
-        $b64
-    );
-    return base64_decode($b64);
+	$b64 = str_replace(
+		array('-', '_'),
+		array('+', '/'),
+		$b64
+	);
+	return base64_decode($b64);
   }
 
   /**
@@ -59,45 +59,45 @@ 
    */
   public static function getStrLen($str)
   {
-    $strlenVar = strlen($str);
-    $d = $ret = 0;
-    for ($count = 0; $count < $strlenVar; ++ $count) {
-      $ordinalValue = ord($str{$ret});
-      switch (true) {
-        case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
-          // characters U-00000000 - U-0000007F (same as ASCII)
-          $ret ++;
-          break;
-        case (($ordinalValue & 0xE0) == 0xC0):
-          // characters U-00000080 - U-000007FF, mask 110XXXXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 2;
-          break;
-        case (($ordinalValue & 0xF0) == 0xE0):
-          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 3;
-          break;
-        case (($ordinalValue & 0xF8) == 0xF0):
-          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 4;
-          break;
-        case (($ordinalValue & 0xFC) == 0xF8):
-          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 5;
-          break;
-        case (($ordinalValue & 0xFE) == 0xFC):
-          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 6;
-          break;
-        default:
-          $ret ++;
-      }
-    }
-    return $ret;
+	$strlenVar = strlen($str);
+	$d = $ret = 0;
+	for ($count = 0; $count < $strlenVar; ++ $count) {
+	  $ordinalValue = ord($str{$ret});
+	  switch (true) {
+		case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
+		  // characters U-00000000 - U-0000007F (same as ASCII)
+		  $ret ++;
+		  break;
+		case (($ordinalValue & 0xE0) == 0xC0):
+		  // characters U-00000080 - U-000007FF, mask 110XXXXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 2;
+		  break;
+		case (($ordinalValue & 0xF0) == 0xE0):
+		  // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 3;
+		  break;
+		case (($ordinalValue & 0xF8) == 0xF0):
+		  // characters U-00010000 - U-001FFFFF, mask 11110XXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 4;
+		  break;
+		case (($ordinalValue & 0xFC) == 0xF8):
+		  // characters U-00200000 - U-03FFFFFF, mask 111110XX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 5;
+		  break;
+		case (($ordinalValue & 0xFE) == 0xFC):
+		  // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 6;
+		  break;
+		default:
+		  $ret ++;
+	  }
+	}
+	return $ret;
   }
 
   /**
@@ -107,15 +107,15 @@ 
    */
   public static function normalize($arr)
   {
-    if (!is_array($arr)) {
-      return array();
-    }
+	if (!is_array($arr)) {
+	  return array();
+	}
 
-    $normalized = array();
-    foreach ($arr as $key => $val) {
-      $normalized[strtolower($key)] = $val;
-    }
-    return $normalized;
+	$normalized = array();
+	foreach ($arr as $key => $val) {
+	  $normalized[strtolower($key)] = $val;
+	}
+	return $normalized;
   }
 
   /**
@@ -125,9 +125,9 @@ 
    */
   public static function camelCase($value)
   {
-    $value = ucwords(str_replace(array('-', '_'), ' ', $value));
-    $value = str_replace(' ', '', $value);
-    $value[0] = strtolower($value[0]);
-    return $value;
+	$value = ucwords(str_replace(array('-', '_'), ' ', $value));
+	$value = str_replace(' ', '', $value);
+	$value[0] = strtolower($value[0]);
+	return $value;
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
       switch (true) {
         case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
           // characters U-00000000 - U-0000007F (same as ASCII)
-          $ret ++;
+          $ret++;
           break;
         case (($ordinalValue & 0xE0) == 0xC0):
           // characters U-00000080 - U-000007FF, mask 110XXXXX
@@ -94,7 +94,7 @@ 
           $ret += 6;
           break;
         default:
-          $ret ++;
+          $ret++;
       }
     }
     return $ret;

geodirectory-admin/google-api-php-client/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -23,4 +23,4 @@
 $error = "google-api-php-client's autoloader was moved to src/Google/autoload.php in 1.1.3. This ";
 $error .= "redirect will be removed in 1.2. Please adjust your code to use the new location.";
 trigger_error($error, E_USER_DEPRECATED);
-require_once dirname(__FILE__) . '/src/Google/autoload.php';
+require_once dirname(__FILE__).'/src/Google/autoload.php';

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

Indentation +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -36,7 +36,7 @@ 
    */
   public function getClient()
   {
-    return $this->client;
+	return $this->client;
   }
 
   /**
@@ -46,11 +46,11 @@ 
    */
   public function createBatch()
   {
-    return new Google_Http_Batch(
-        $this->client,
-        false,
-        $this->rootUrl,
-        $this->batchPath
-    );
+	return new Google_Http_Batch(
+		$this->client,
+		false,
+		$this->rootUrl,
+		$this->batchPath
+	);
   }
 }

geodirectory-admin/google-api-php-client/src/Google/Collection.php

Indentation +42 added lines, -42 removed lines

@@ -15,87 +15,87 @@
 
   public function rewind()
   {
-    if (isset($this->modelData[$this->collection_key])
-        && is_array($this->modelData[$this->collection_key])) {
-      reset($this->modelData[$this->collection_key]);
-    }
+	if (isset($this->modelData[$this->collection_key])
+		&& is_array($this->modelData[$this->collection_key])) {
+	  reset($this->modelData[$this->collection_key]);
+	}
   }
 
   public function current()
   {
-    $this->coerceType($this->key());
-    if (is_array($this->modelData[$this->collection_key])) {
-      return current($this->modelData[$this->collection_key]);
-    }
+	$this->coerceType($this->key());
+	if (is_array($this->modelData[$this->collection_key])) {
+	  return current($this->modelData[$this->collection_key]);
+	}
   }
 
   public function key()
   {
-    if (isset($this->modelData[$this->collection_key])
-        && is_array($this->modelData[$this->collection_key])) {
-      return key($this->modelData[$this->collection_key]);
-    }
+	if (isset($this->modelData[$this->collection_key])
+		&& is_array($this->modelData[$this->collection_key])) {
+	  return key($this->modelData[$this->collection_key]);
+	}
   }
 
   public function next()
   {
-    return next($this->modelData[$this->collection_key]);
+	return next($this->modelData[$this->collection_key]);
   }
 
   public function valid()
   {
-    $key = $this->key();
-    return $key !== null && $key !== false;
+	$key = $this->key();
+	return $key !== null && $key !== false;
   }
 
   public function count()
   {
-    if (!isset($this->modelData[$this->collection_key])) {
-      return 0;
-    }
-    return count($this->modelData[$this->collection_key]);
+	if (!isset($this->modelData[$this->collection_key])) {
+	  return 0;
+	}
+	return count($this->modelData[$this->collection_key]);
   }
 
   public function offsetExists($offset)
   {
-    if (!is_numeric($offset)) {
-      return parent::offsetExists($offset);
-    }
-    return isset($this->modelData[$this->collection_key][$offset]);
+	if (!is_numeric($offset)) {
+	  return parent::offsetExists($offset);
+	}
+	return isset($this->modelData[$this->collection_key][$offset]);
   }
 
   public function offsetGet($offset)
   {
-    if (!is_numeric($offset)) {
-      return parent::offsetGet($offset);
-    }
-    $this->coerceType($offset);
-    return $this->modelData[$this->collection_key][$offset];
+	if (!is_numeric($offset)) {
+	  return parent::offsetGet($offset);
+	}
+	$this->coerceType($offset);
+	return $this->modelData[$this->collection_key][$offset];
   }
 
   public function offsetSet($offset, $value)
   {
-    if (!is_numeric($offset)) {
-      return parent::offsetSet($offset, $value);
-    }
-    $this->modelData[$this->collection_key][$offset] = $value;
+	if (!is_numeric($offset)) {
+	  return parent::offsetSet($offset, $value);
+	}
+	$this->modelData[$this->collection_key][$offset] = $value;
   }
 
   public function offsetUnset($offset)
   {
-    if (!is_numeric($offset)) {
-      return parent::offsetUnset($offset);
-    }
-    unset($this->modelData[$this->collection_key][$offset]);
+	if (!is_numeric($offset)) {
+	  return parent::offsetUnset($offset);
+	}
+	unset($this->modelData[$this->collection_key][$offset]);
   }
 
   private function coerceType($offset)
   {
-    $typeKey = $this->keyType($this->collection_key);
-    if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) {
-      $type = $this->$typeKey;
-      $this->modelData[$this->collection_key][$offset] =
-          new $type($this->modelData[$this->collection_key][$offset]);
-    }
+	$typeKey = $this->keyType($this->collection_key);
+	if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) {
+	  $type = $this->$typeKey;
+	  $this->modelData[$this->collection_key][$offset] =
+		  new $type($this->modelData[$this->collection_key][$offset]);
+	}
   }
 }

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 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/Verifier/Pem.php

Indentation +16 added lines, -16 removed lines

@@ -38,20 +38,20 @@ 
    */
   public function __construct($pem)
   {
-    if (!function_exists('openssl_x509_read')) {
-      throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
-    }
-    $this->publicKey = openssl_x509_read($pem);
-    if (!$this->publicKey) {
-      throw new Google_Auth_Exception("Unable to parse PEM: $pem");
-    }
+	if (!function_exists('openssl_x509_read')) {
+	  throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
+	}
+	$this->publicKey = openssl_x509_read($pem);
+	if (!$this->publicKey) {
+	  throw new Google_Auth_Exception("Unable to parse PEM: $pem");
+	}
   }
 
   public function __destruct()
   {
-    if ($this->publicKey) {
-      openssl_x509_free($this->publicKey);
-    }
+	if ($this->publicKey) {
+	  openssl_x509_free($this->publicKey);
+	}
   }
 
   /**
@@ -65,11 +65,11 @@ 
    */
   public function verify($data, $signature)
   {
-    $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
-    $status = openssl_verify($data, $signature, $this->publicKey, $hash);
-    if ($status === -1) {
-      throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string());
-    }
-    return $status === 1;
+	$hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
+	$status = openssl_verify($data, $signature, $this->publicKey, $hash);
+	if ($status === -1) {
+	  throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string());
+	}
+	return $status === 1;
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  */
  
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -68,7 +68,7 @@ 
     $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
     $status = openssl_verify($data, $signature, $this->publicKey, $hash);
     if ($status === -1) {
-      throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string());
+      throw new Google_Auth_Exception('Signature verification error: '.openssl_error_string());
     }
     return $status === 1;
   }

geodirectory-admin/google-api-php-client/src/Google/Cache/Apc.php

Indentation +47 added lines, -47 removed lines

@@ -36,44 +36,44 @@ 
 
   public function __construct(Google_Client $client)
   {
-    if (! function_exists('apc_add') ) {
-      $error = "Apc functions not available";
+	if (! function_exists('apc_add') ) {
+	  $error = "Apc functions not available";
 
-      $client->getLogger()->error($error);
-      throw new Google_Cache_Exception($error);
-    }
+	  $client->getLogger()->error($error);
+	  throw new Google_Cache_Exception($error);
+	}
 
-    $this->client = $client;
+	$this->client = $client;
   }
 
    /**
-   * @inheritDoc
-   */
+    * @inheritDoc
+    */
   public function get($key, $expiration = false)
   {
-    $ret = apc_fetch($key);
-    if ($ret === false) {
-      $this->client->getLogger()->debug(
-          'APC cache miss',
-          array('key' => $key)
-      );
-      return false;
-    }
-    if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
-      $this->client->getLogger()->debug(
-          'APC cache miss (expired)',
-          array('key' => $key, 'var' => $ret)
-      );
-      $this->delete($key);
-      return false;
-    }
+	$ret = apc_fetch($key);
+	if ($ret === false) {
+	  $this->client->getLogger()->debug(
+		  'APC cache miss',
+		  array('key' => $key)
+	  );
+	  return false;
+	}
+	if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+	  $this->client->getLogger()->debug(
+		  'APC cache miss (expired)',
+		  array('key' => $key, 'var' => $ret)
+	  );
+	  $this->delete($key);
+	  return false;
+	}
 
-    $this->client->getLogger()->debug(
-        'APC cache hit',
-        array('key' => $key, 'var' => $ret)
-    );
+	$this->client->getLogger()->debug(
+		'APC cache hit',
+		array('key' => $key, 'var' => $ret)
+	);
 
-    return $ret['data'];
+	return $ret['data'];
   }
 
   /**
@@ -81,21 +81,21 @@ 
    */
   public function set($key, $value)
   {
-    $var = array('time' => time(), 'data' => $value);
-    $rc = apc_store($key, $var);
+	$var = array('time' => time(), 'data' => $value);
+	$rc = apc_store($key, $var);
 
-    if ($rc == false) {
-      $this->client->getLogger()->error(
-          'APC cache set failed',
-          array('key' => $key, 'var' => $var)
-      );
-      throw new Google_Cache_Exception("Couldn't store data");
-    }
+	if ($rc == false) {
+	  $this->client->getLogger()->error(
+		  'APC cache set failed',
+		  array('key' => $key, 'var' => $var)
+	  );
+	  throw new Google_Cache_Exception("Couldn't store data");
+	}
 
-    $this->client->getLogger()->debug(
-        'APC cache set',
-        array('key' => $key, 'var' => $var)
-    );
+	$this->client->getLogger()->debug(
+		'APC cache set',
+		array('key' => $key, 'var' => $var)
+	);
   }
 
   /**
@@ -104,10 +104,10 @@ 
    */
   public function delete($key)
   {
-    $this->client->getLogger()->debug(
-        'APC cache delete',
-        array('key' => $key)
-    );
-    apc_delete($key);
+	$this->client->getLogger()->debug(
+		'APC cache delete',
+		array('key' => $key)
+	);
+	apc_delete($key);
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -36,7 +36,7 @@ 
 
   public function __construct(Google_Client $client)
   {
-    if (! function_exists('apc_add') ) {
+    if (!function_exists('apc_add')) {
       $error = "Apc functions not available";
 
       $client->getLogger()->error($error);

geodirectory-admin/google-api-php-client/src/Google/Cache/Memcache.php

Indentation +104 added lines, -104 removed lines

@@ -43,29 +43,29 @@ 
 
   public function __construct(Google_Client $client)
   {
-    if (!function_exists('memcache_connect') && !class_exists("Memcached")) {
-      $error = "Memcache functions not available";
-
-      $client->getLogger()->error($error);
-      throw new Google_Cache_Exception($error);
-    }
-
-    $this->client = $client;
-
-    if ($client->isAppEngine()) {
-      // No credentials needed for GAE.
-      $this->mc = new Memcached();
-      $this->connection = true;
-    } else {
-      $this->host = $client->getClassConfig($this, 'host');
-      $this->port = $client->getClassConfig($this, 'port');
-      if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) {
-        $error = "You need to supply a valid memcache host and port";
-
-        $client->getLogger()->error($error);
-        throw new Google_Cache_Exception($error);
-      }
-    }
+	if (!function_exists('memcache_connect') && !class_exists("Memcached")) {
+	  $error = "Memcache functions not available";
+
+	  $client->getLogger()->error($error);
+	  throw new Google_Cache_Exception($error);
+	}
+
+	$this->client = $client;
+
+	if ($client->isAppEngine()) {
+	  // No credentials needed for GAE.
+	  $this->mc = new Memcached();
+	  $this->connection = true;
+	} else {
+	  $this->host = $client->getClassConfig($this, 'host');
+	  $this->port = $client->getClassConfig($this, 'port');
+	  if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) {
+		$error = "You need to supply a valid memcache host and port";
+
+		$client->getLogger()->error($error);
+		throw new Google_Cache_Exception($error);
+	  }
+	}
   }
 
   /**
@@ -73,35 +73,35 @@ 
    */
   public function get($key, $expiration = false)
   {
-    $this->connect();
-    $ret = false;
-    if ($this->mc) {
-      $ret = $this->mc->get($key);
-    } else {
-      $ret = memcache_get($this->connection, $key);
-    }
-    if ($ret === false) {
-      $this->client->getLogger()->debug(
-          'Memcache cache miss',
-          array('key' => $key)
-      );
-      return false;
-    }
-    if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
-      $this->client->getLogger()->debug(
-          'Memcache cache miss (expired)',
-          array('key' => $key, 'var' => $ret)
-      );
-      $this->delete($key);
-      return false;
-    }
-
-    $this->client->getLogger()->debug(
-        'Memcache cache hit',
-        array('key' => $key, 'var' => $ret)
-    );
-
-    return $ret['data'];
+	$this->connect();
+	$ret = false;
+	if ($this->mc) {
+	  $ret = $this->mc->get($key);
+	} else {
+	  $ret = memcache_get($this->connection, $key);
+	}
+	if ($ret === false) {
+	  $this->client->getLogger()->debug(
+		  'Memcache cache miss',
+		  array('key' => $key)
+	  );
+	  return false;
+	}
+	if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+	  $this->client->getLogger()->debug(
+		  'Memcache cache miss (expired)',
+		  array('key' => $key, 'var' => $ret)
+	  );
+	  $this->delete($key);
+	  return false;
+	}
+
+	$this->client->getLogger()->debug(
+		'Memcache cache hit',
+		array('key' => $key, 'var' => $ret)
+	);
+
+	return $ret['data'];
   }
 
   /**
@@ -112,29 +112,29 @@ 
    */
   public function set($key, $value)
   {
-    $this->connect();
-    // we store it with the cache_time default expiration so objects will at
-    // least get cleaned eventually.
-    $data = array('time' => time(), 'data' => $value);
-    $rc = false;
-    if ($this->mc) {
-      $rc = $this->mc->set($key, $data);
-    } else {
-      $rc = memcache_set($this->connection, $key, $data, false);
-    }
-    if ($rc == false) {
-      $this->client->getLogger()->error(
-          'Memcache cache set failed',
-          array('key' => $key, 'var' => $data)
-      );
-
-      throw new Google_Cache_Exception("Couldn't store data in cache");
-    }
-
-    $this->client->getLogger()->debug(
-        'Memcache cache set',
-        array('key' => $key, 'var' => $data)
-    );
+	$this->connect();
+	// we store it with the cache_time default expiration so objects will at
+	// least get cleaned eventually.
+	$data = array('time' => time(), 'data' => $value);
+	$rc = false;
+	if ($this->mc) {
+	  $rc = $this->mc->set($key, $data);
+	} else {
+	  $rc = memcache_set($this->connection, $key, $data, false);
+	}
+	if ($rc == false) {
+	  $this->client->getLogger()->error(
+		  'Memcache cache set failed',
+		  array('key' => $key, 'var' => $data)
+	  );
+
+	  throw new Google_Cache_Exception("Couldn't store data in cache");
+	}
+
+	$this->client->getLogger()->debug(
+		'Memcache cache set',
+		array('key' => $key, 'var' => $data)
+	);
   }
 
   /**
@@ -143,17 +143,17 @@ 
    */
   public function delete($key)
   {
-    $this->connect();
-    if ($this->mc) {
-      $this->mc->delete($key, 0);
-    } else {
-      memcache_delete($this->connection, $key, 0);
-    }
-
-    $this->client->getLogger()->debug(
-        'Memcache cache delete',
-        array('key' => $key)
-    );
+	$this->connect();
+	if ($this->mc) {
+	  $this->mc->delete($key, 0);
+	} else {
+	  memcache_delete($this->connection, $key, 0);
+	}
+
+	$this->client->getLogger()->debug(
+		'Memcache cache delete',
+		array('key' => $key)
+	);
   }
 
   /**
@@ -162,23 +162,23 @@ 
    */
   private function connect()
   {
-    if ($this->connection) {
-      return;
-    }
-
-    if (class_exists("Memcached")) {
-      $this->mc = new Memcached();
-      $this->mc->addServer($this->host, $this->port);
-       $this->connection = true;
-    } else {
-      $this->connection = memcache_pconnect($this->host, $this->port);
-    }
-
-    if (! $this->connection) {
-      $error = "Couldn't connect to memcache server";
-
-      $this->client->getLogger()->error($error);
-      throw new Google_Cache_Exception($error);
-    }
+	if ($this->connection) {
+	  return;
+	}
+
+	if (class_exists("Memcached")) {
+	  $this->mc = new Memcached();
+	  $this->mc->addServer($this->host, $this->port);
+	   $this->connection = true;
+	} else {
+	  $this->connection = memcache_pconnect($this->host, $this->port);
+	}
+
+	if (! $this->connection) {
+	  $error = "Couldn't connect to memcache server";
+
+	  $this->client->getLogger()->error($error);
+	  throw new Google_Cache_Exception($error);
+	}
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -174,7 +174,7 @@ 
       $this->connection = memcache_pconnect($this->host, $this->port);
     }
 
-    if (! $this->connection) {
+    if (!$this->connection) {
       $error = "Couldn't connect to memcache server";
 
       $this->client->getLogger()->error($error);

geodirectory-admin/google-api-php-client/src/Google/Cache/Null.php

Indentation +5 added lines, -5 removed lines

@@ -31,11 +31,11 @@ 
   }
 
    /**
-   * @inheritDoc
-   */
+    * @inheritDoc
+    */
   public function get($key, $expiration = false)
   {
-    return false;
+	return false;
   }
 
   /**
@@ -43,7 +43,7 @@ 
    */
   public function set($key, $value)
   {
-    // Nop.
+	// Nop.
   }
 
   /**
@@ -52,6 +52,6 @@ 
    */
   public function delete($key)
   {
-    // Nop.
+	// Nop.
   }
 }

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/Cache/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_Cache_Exception extends Google_Exception